diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 14:57:14 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 14:57:14 -0400 |
| commit | 9a8b1552f0fbff3cde1c8fa5e24924e237008814 (patch) | |
| tree | 257179762be5e79df9b9141256b79faee303537b /indra/newview/llgroupactions.cpp | |
| parent | fb7c5efe3217e10a8258c9ed276116f64925e0e0 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge. Refresh from viewer-release after 3.7.13 release.
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rwxr-xr-x | indra/newview/llgroupactions.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index f514729aa1..913efd6434 100755 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -149,7 +149,7 @@ public: void changed(LLGroupChange gc) { - if (gc == GC_MEMBER_DATA && !mRequestProcessed) + if (gc == GC_PROPERTIES && !mRequestProcessed) { LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupId); if (!gdatap) @@ -159,9 +159,6 @@ public: else if (!gdatap->isMemberDataComplete()) { LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was FALSE" << LL_ENDL; - } - else - { processGroupData(); mRequestProcessed = true; } |