diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
| commit | 56bd42dcf1ffdf0bf8099a1c87dc7a52ca9663ff (patch) | |
| tree | d951e7af2b120fe1ba58373aa528fb1a5f4b5263 /src/server/game/Accounts/AccountMgr.cpp | |
| parent | 7104e3c70f9849dfbc481084a8bd3c20d99b3036 (diff) | |
| parent | 779a59e7e218e340ac5cefd3297ea970d804239d (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
Diffstat (limited to 'src/server/game/Accounts/AccountMgr.cpp')
| -rw-r--r-- | src/server/game/Accounts/AccountMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index ea6d87b3946..4075ffa4de9 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -439,7 +439,7 @@ void AccountMgr::LoadRBAC() TC_LOG_DEBUG(LOG_FILTER_RBAC, "AccountMgr::LoadRBAC: Loading default groups"); // Load default groups to be added to any RBAC Object. - std::string defaultGroups = ConfigMgr::GetStringDefault("RBAC.DefaultGroups", ""); + std::string defaultGroups = sConfigMgr->GetStringDefault("RBAC.DefaultGroups", ""); Tokenizer tokens(defaultGroups, ','); for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr) if (uint32 groupId = atoi(*itr)) @@ -448,7 +448,7 @@ void AccountMgr::LoadRBAC() void AccountMgr::UpdateAccountAccess(RBACData* rbac, uint32 accountId, uint8 securityLevel, int32 realmId) { - int32 serverRealmId = realmId != -1 ? realmId : ConfigMgr::GetIntDefault("RealmID", 0); + int32 serverRealmId = realmId != -1 ? realmId : sConfigMgr->GetIntDefault("RealmID", 0); bool needDelete = false; if (!rbac) { |