diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-22 00:58:08 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-22 00:58:08 +0200 |
| commit | e5606c6f6f49a7adca719d6f70475743fce76919 (patch) | |
| tree | 5c563e3dd1fd390fe46ede72cc1596b6a9f4c623 /src/server/game/DungeonFinding/LFGScripts.cpp | |
| parent | ec49d510fc1ba0eb902ab38ba76388ffc99b935c (diff) | |
| parent | ac343c72cc954b7af78ab131811fc8e73907efef (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
Diffstat (limited to 'src/server/game/DungeonFinding/LFGScripts.cpp')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGScripts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index 49264dff039..6a38afb398d 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -46,7 +46,7 @@ void LFGPlayerScript::OnLogout(Player* player) } } -void LFGPlayerScript::OnLogin(Player* player) +void LFGPlayerScript::OnLogin(Player* player, bool /*loginFirst*/) { if (!sLFGMgr->isOptionEnabled(LFG_OPTION_ENABLE_DUNGEON_FINDER | LFG_OPTION_ENABLE_RAID_BROWSER)) return; |