diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-08 13:01:22 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2016-08-08 13:01:22 +0200 |
| commit | 6f7a0465750ac11c668e1cfd5fa2502059325f10 (patch) | |
| tree | 58893a601ad6d64343a70a0874ae1032dec146ad /src | |
| parent | e54bfb31e4ba116d9789be0ceba92f303de912db (diff) | |
| parent | ce20864257bf2814d184a4f78523c689ab4c5fa7 (diff) | |
Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git into gh-master1.0-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/authserver.conf.dist | 4 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 12 |
3 files changed, 9 insertions, 9 deletions
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 |