summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-16 12:16:24 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-16 12:16:24 -0500
commitace0be2a7c0665e382e47aeedfcffed7410e11a9 (patch)
tree2d437342310d52806c6b378f1046ad56d9eb6456 /indra/newview/llgroupactions.cpp
parent90bb29245cbd9626f840f1d16c351ac415f7c35e (diff)
parent1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (diff)
merge with avp-tip
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r--indra/newview/llgroupactions.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index fdb2b886a6..ff75d461df 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -35,6 +35,8 @@
#include "llgroupactions.h"
+#include "message.h"
+
#include "llagent.h"
#include "llcommandhandler.h"
#include "llfloaterreg.h"
@@ -197,12 +199,12 @@ void LLGroupActions::activate(const LLUUID& group_id)
gAgent.sendReliableMessage();
}
-bool isGroupUIVisible()
+static bool isGroupUIVisible()
{
LLPanel* panel = LLSideTray::getInstance()->findChild<LLPanel>("panel_group_info_sidetray");
if(!panel)
return false;
- return panel->getVisible();
+ return panel->isInVisibleChain();
}
// static