Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git into gh-master1.0-dev

5 files changed, 16 insertions, 11 deletions

diff --git a/bin/db_assembler/db_assembler.sh b/bin/db_assembler/db_assembler.sh
index 1716b71eb9..d5bf3fac1f 100755
--- a/bin/db_assembler/db_assembler.sh
+++ b/bin/db_assembler/db_assembler.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-SRCPATH=$(readlink -f "../../")
+unamestr=`uname`
+if [[ "$unamestr" == 'Darwin' ]]; then
+   SRCPATH=$(greadlink -f "../../")
+else
+   SRCPATH=$(readlink -f "../../")
+fi
 
 source $SRCPATH"/bin/bash_shared/includes.sh"
 
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMesh.h b/modules/dep/recastnavigation/Detour/DetourNavMesh.h
index 52d2c505ec..fb882929f4 100644
--- a/modules/dep/recastnavigation/Detour/DetourNavMesh.h
+++ b/modules/dep/recastnavigation/Detour/DetourNavMesh.h
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #endif
 #endif
-    typedef uint64_t           uint64;
+    typedef unsigned long uint64;
 #endif
 
 // Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index 57d822a68e..d0509d6a20 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -244,9 +244,9 @@ WrongPass.BanType = 0
 #                                                                 section my.ini)
 #                     ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
 #                                                                           Unix/Linux)
-#        Default:     "127.0.0.1;3306;trinity;trinity;auth"
+#        Default:     "127.0.0.1;3306;root;root;auth"
 
-LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
+LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
 
 #
 #    LoginDatabase.WorkerThreads
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 94dff1fa44..f1e22d9370 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -444,7 +444,7 @@ void World::LoadConfigSettings(bool reload)
     ///- Read the player limit and the Message of the day from the config file
     if (!reload)
         SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100));
-    SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to a Sunwell Core Server."));
+    SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server"));
 
     ///- Read ticket system setting from the config file
     m_bool_configs[CONFIG_ALLOW_TICKETS] = sConfigMgr->GetBoolDefault("AllowTickets", true);
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index de665adb14..d9262d4b37 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -83,13 +83,13 @@ LogsDir = ""
 #                                                                 section my.ini)
 #                     ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
 #                                                                           Unix/Linux)
-#        Default:     "127.0.0.1;3306;trinity;trinity;auth"       - (LoginDatabaseInfo)
-#                     "127.0.0.1;3306;trinity;trinity;world"      - (WorldDatabaseInfo)
-#                     "127.0.0.1;3306;trinity;trinity;characters" - (CharacterDatabaseInfo)
+#        Default:     "127.0.0.1;3306;root;root;auth"       - (LoginDatabaseInfo)
+#                     "127.0.0.1;3306;root;root;world"      - (WorldDatabaseInfo)
+#                     "127.0.0.1;3306;root;root;characters" - (CharacterDatabaseInfo)
 
-LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;auth"
-WorldDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;world"
-CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
+LoginDatabaseInfo     = "127.0.0.1;3306;root;root;auth"
+WorldDatabaseInfo     = "127.0.0.1;3306;root;root;world"
+CharacterDatabaseInfo = "127.0.0.1;3306;root;root;characters"
 
 #
 #    LoginDatabase.WorkerThreads