diff options
author | Nay <dnpd.dd@gmail.com> | 2012-08-21 23:40:38 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-08-21 23:40:38 +0100 |
commit | e3ea3b28bd6d505495908899de154dcf92a219d8 (patch) | |
tree | 78e2be369f41de7e109f097ddb434f32747f0c13 /src/server/worldserver/Master.cpp | |
parent | df2d42e5c7619e0eb5bc9e22ab23d32facbb33ca (diff) |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Groups/Group.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/worldserver/Master.cpp')
-rwxr-xr-x | src/server/worldserver/Master.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 48e07c727b4..7587a9d1904 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -240,7 +240,7 @@ int Master::Run() if (ConfigMgr::GetBoolDefault("SOAP.Enabled", false)) { TCSoapRunnable* runnable = new TCSoapRunnable(); - runnable->setListenArguments(ConfigMgr::GetStringDefault("SOAP.IP", "127.0.0.1"), ConfigMgr::GetIntDefault("SOAP.Port", 7878)); + runnable->setListenArguments(ConfigMgr::GetStringDefault("SOAP.IP", "127.0.0.1"), uint16(ConfigMgr::GetIntDefault("SOAP.Port", 7878))); soap_thread = new ACE_Based::Thread(runnable); } |