summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-14 21:50:02 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-14 21:50:02 +0000
commit73caee4208a4e05f66583de099502012fd8415ea (patch)
treeff9fa1b7b010e71fb62f26a32c912b5e266f3b23 /indra/newview/llviewermenu.cpp
parent1db494f58ad378b8028c1f071196be82af5fe964 (diff)
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index db65203950..499632def3 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3458,7 +3458,10 @@ class LLSelfFriends : public view_listener_t
bool handleEvent(const LLSD& userdata)
{
// Open "Friends" tab of the "People" panel in side tray.
- LLSideTray::getInstance()->showPanel("panel_people", "friends_panel");
+ LLSD param;
+ param["people_panel_tab_name"] = "friends_panel";
+
+ LLSideTray::getInstance()->showPanel("panel_people", param);
return true;
}
};
@@ -3468,7 +3471,9 @@ class LLSelfGroups : public view_listener_t
bool handleEvent(const LLSD& userdata)
{
// Open "Groups" tab of the "People" panel in side tray.
- LLSideTray::getInstance()->showPanel("panel_people", "groups_panel");
+ LLSD param;
+ param["people_panel_tab_name"] = "groups_panel";
+ LLSideTray::getInstance()->showPanel("panel_people", param);
return true;
}
};