livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5240 FIXED Per Kelly, added delay to GroupPropertiesRequest too

master
AndreyL ProductEngine 2015-06-04 19:40:21 +03:00
parent adcd7030ea
commit 71209a51af
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llspeakers.cpp
View File

@ -548,7 +548,8 @@ void LLSpeakerMgr::updateSpeakerList()
// Note: The session uuid and the group uuid are actually one and the same. If that was to change, this will fail.
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(session_id);
if (!gdatap || !gdatap->isGroupPropertiesDataComplete())
if (!gdatap || !gdatap->isGroupPropertiesDataComplete()
&& mGetListTime.getElapsedTimeF32() >= gSavedSettings.getF32("ChatLoadGroupTimeout"))
{
// Request group properties first. This is to avoid fetching lagre member lists here. See MAINT-5240
LLGroupMgr::getInstance()->sendGroupPropertiesRequest(session_id);