summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelimcontrolpanel.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-13 05:32:26 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-13 05:32:26 +0000
commit2ac24047df0fd967ef67564e8d7bfe94dcf11554 (patch)
tree0d26f3bf178b84f99e540e28e239f321744d1f01 /indra/newview/llpanelimcontrolpanel.cpp
parentfaafa7405f2fe70996c1554605b55679c28fd10b (diff)
Skinning merge fix plus missed files.
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
-rw-r--r--indra/newview/llpanelimcontrolpanel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index d34ca88fc6..f9de409596 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -37,7 +37,6 @@
#include "llavataractions.h"
#include "llavatariconctrl.h"
#include "llbutton.h"
-#include "llfloatergroupinfo.h"
LLPanelIMControlPanel::LLPanelIMControlPanel()
{
@@ -96,7 +95,7 @@ BOOL LLPanelGroupControlPanel::postBuild()
void LLPanelGroupControlPanel::onGroupInfoButtonClicked()
{
- LLFloaterGroupInfo::showFromUUID(mGroupID);
+ //LLFloaterGroupInfo::showFromUUID(mGroupID);
}