diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-05 13:06:04 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-05 13:06:04 +0300 |
| commit | 77b4f1d51c6e9d2b7d6711bfa38912ba4682c320 (patch) | |
| tree | 98ea52adfca8f0109409864817ed889953f7eeec /indra | |
| parent | dbaec6a34e45ffdd90d09b291dce79b3fafd520c (diff) | |
build fix
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llspeakers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |