From 36e932b4d8590171d8fb3552db89c915684629c9 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 17 Aug 2009 17:02:48 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1351
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1365 ->
 viewer-2.0.0-3 EXT 451 EXT-303 EXT-367 EXT-367 EXT-371 EXT-394 EXT-494
 EXT-502 EXT-503 EXT-516 EXT-538 EXT-540

---
 indra/newview/llpanelimcontrolpanel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llpanelimcontrolpanel.cpp')

diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index f9de409596..1d50bb26f6 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -37,6 +37,7 @@
 #include "llavataractions.h"
 #include "llavatariconctrl.h"
 #include "llbutton.h"
+#include "llgroupactions.h"
 
 LLPanelIMControlPanel::LLPanelIMControlPanel()
 {
@@ -95,7 +96,7 @@ BOOL LLPanelGroupControlPanel::postBuild()
 
 void LLPanelGroupControlPanel::onGroupInfoButtonClicked()
 {
-	//LLFloaterGroupInfo::showFromUUID(mGroupID);
+	LLGroupActions::show(mGroupID);
 }
 
 
-- 
cgit v1.2.3