diff options
| author | Brian <runningnak3d@gmail.com> | 2010-04-01 12:56:52 -0600 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-04-01 12:56:52 -0600 |
| commit | 8ddcc2985c002b4158509ff6cca23e58bd6322d2 (patch) | |
| tree | 87bc1d26ea631955267d32d9f8dca448389750aa /src/game/SocialMgr.cpp | |
| parent | 0b38c48ec9cbed0702d9fa3c3708b6b85db36382 (diff) | |
| parent | f78b766705104444f695a265bce712d59a22cbb3 (diff) | |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SocialMgr.cpp')
| -rw-r--r-- | src/game/SocialMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index c619da3178d..f11cc092ba0 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -313,8 +313,8 @@ PlayerSocial *SocialMgr::LoadFromDB(QueryResult_AutoPtr result, uint32 guid) social->m_playerSocialMap[friend_guid] = FriendInfo(flags, note); - // client limit - if(social->m_playerSocialMap.size() >= 50) + // client's friends list and ignore list limit + if(social->m_playerSocialMap.size() >= (SOCIALMGR_FRIEND_LIMIT + SOCIALMGR_IGNORE_LIMIT)) break; } while (result->NextRow()); |