summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-10-21 00:32:19 +0000
committerJames Cook <james@lindenlab.com>2009-10-21 00:32:19 +0000
commita2d0b1d77ffdf78ca3dd0a5db276e657a8c4919e (patch)
treead847f4cc363b761c1a4058ff694c81b722878f7 /indra/newview/llviewermenu.cpp
parent40ca1f90cead2e5445eb5152de05350aea0fa195 (diff)
Side tray uses normal panel colors, not hard-coded floater colors.
Added "Show Side Tray" to login debug menu. Fixed strange border color around Home side tray panel, more similar fixes to follow. Reviewed with Richard.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a9ba9ead1a..4ee0986046 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3447,6 +3447,15 @@ bool enable_standup_self()
return new_value;
}
+// Used from the login screen to aid in UI work on side tray
+void handle_show_side_tray()
+{
+ LLSideTray* side_tray = LLSideTray::getInstance();
+ LLView* root = gViewerWindow->getRootView();
+ // automatically removes and re-adds if there already
+ root->addChild(side_tray);
+}
+
class LLSelfFriends : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@@ -7931,7 +7940,7 @@ void initialize_menus()
view_listener_t::addMenu(new LLAdvancedCheckDebugKeys(), "Advanced.CheckDebugKeys");
view_listener_t::addMenu(new LLAdvancedToggleDebugWindowProc(), "Advanced.ToggleDebugWindowProc");
view_listener_t::addMenu(new LLAdvancedCheckDebugWindowProc(), "Advanced.CheckDebugWindowProc");
-
+ commit.add("Advanced.ShowSideTray", boost::bind(&handle_show_side_tray));
// Advanced > XUI
commit.add("Advanced.ReloadColorSettings", boost::bind(&LLUIColorTable::loadFromSettings, LLUIColorTable::getInstance()));