diff options
author | Aura Linden <aura@lindenlab.com> | 2014-09-18 17:20:41 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-09-18 17:20:41 -0700 |
commit | 1bb34847e8189883faab70a57237945671057941 (patch) | |
tree | 68f2448a26add2e59b8bb2d0eb24be3772798adf /indra | |
parent | 181e48c4422a69c94956977d1f8da05ce6384f7a (diff) | |
parent | 951c83724d7e364ac52cbee2d657711fda7d2c26 (diff) |
Merged top of viewer-tiger into viewer-lion per Simon's request
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/llspeakers.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 89302c3c64..e80756e4de 100755 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -544,10 +544,18 @@ void LLSpeakerMgr::updateSpeakerList() LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id); if (session->isGroupSessionType() && (mSpeakers.size() <= 1)) { - const F32 load_group_timeout = gSavedSettings.getF32("ChatLoadGroupTimeout"); // For groups, we need to hit the group manager. // 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); + F32 large_group_delay = 0.f; + if (gdatap) + { + //This is a viewer-side bandaid for maint-4414 it does not fix the core issue. + large_group_delay = (F32)(gdatap->mMemberCount / 5000); + } + + const F32 load_group_timeout = gSavedSettings.getF32("ChatLoadGroupTimeout") + large_group_delay; + if (!gdatap && (mGetListTime.getElapsedTimeF32() >= load_group_timeout)) { // Request the data the first time around |