summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-13 16:39:12 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-13 16:39:12 -0400
commit85f54aca0f9c93b60e89e79b70bdb1d88b3bc5d6 (patch)
treee605c21a938a5ba794df6e43607de8c4a0d81008 /indra/newview/llgroupactions.cpp
parent88782e75462ac3a959a59be97ff50b5fc34aabb9 (diff)
parentd05353fc3997f29bcf55a2fa49936e690b0725de (diff)
automated merge
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r--indra/newview/llgroupactions.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index d4eecc8c48..438159b2e6 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -75,12 +75,13 @@ public:
return false;
}
- //*TODO by what to replace showing groups floater?
if (tokens[0].asString() == "list")
{
if (tokens[1].asString() == "show")
{
- //LLFloaterReg::showInstance("contacts", "groups");
+ LLSD params;
+ params["people_panel_tab_name"] = "groups_panel";
+ LLSideTray::getInstance()->showPanel("panel_people", params);
return true;
}
return false;