diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-06-04 19:40:21 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-06-04 19:40:21 +0300 |
| commit | 71209a51af1f2069938653a0de8b9af0e42b56d6 (patch) | |
| tree | 44a5cae8e69cef4e2d536ea17f77514fda735359 /indra | |
| parent | adcd7030ea6de9be85fa738ca36171b5e23fff59 (diff) | |
MAINT-5240 FIXED Per Kelly, added delay to GroupPropertiesRequest too
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llspeakers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index bc92f2a416..cb3ab93e2a 100755 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -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); |