summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-08-04 16:37:17 -0700
committerCallum Prentice <callum@lindenlab.com>2014-08-04 16:37:17 -0700
commit77751a15d1dc976d77d41db5b586e18b5311ccb4 (patch)
tree44e5eb4fe3664ba42ba91f3feb30d57e058e1c7b /indra/newview/llgroupactions.cpp
parentc25105945a9d74e331cae4d827fc3be8d8915b7a (diff)
parent1346949e4d601e8c945fa30593ba1d405e9ed80d (diff)
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rwxr-xr-xindra/newview/llgroupactions.cpp5
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;
}