From 77b4f1d51c6e9d2b7d6711bfa38912ba4682c320 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 5 Jun 2015 13:06:04 +0300 Subject: build fix --- indra/newview/llspeakers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index cb3ab93e2a..aac67b8774 100755 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -548,7 +548,7 @@ 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 -- cgit v1.2.3