From 71209a51af1f2069938653a0de8b9af0e42b56d6 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 4 Jun 2015 19:40:21 +0300 Subject: MAINT-5240 FIXED Per Kelly, added delay to GroupPropertiesRequest too --- indra/newview/llspeakers.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') 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); -- cgit v1.2.3