livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-6588, Cleanup for Develop Menu, ShowColor

Arrehn 2012-06-10 21:16:17 -04:00
parent eeaf8a2957
commit 5157e74854
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llviewermenu.cpp
View File

@ -1809,6 +1809,27 @@ class LLAdvancedToggleShowLookAt : public view_listener_t
}
};
// <AO>
class LLAdvancedToggleShowColor : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
S32 value = !gSavedSettings.getS32("DebugShowColor");
gSavedSettings.setS32("DebugShowColor",value);
return true;
}
};
class LLAdvancedCheckShowColor : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
S32 new_value = gSavedSettings.getS32("DebugShowColor");
return (bool)new_value;
}
};
// </AO>
class LLAdvancedCheckShowLookAt : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@ -9603,6 +9624,8 @@ void initialize_menus()
view_listener_t::addMenu(new LLAdvancedToggleAnimationInfo(), "Advanced.ToggleAnimationInfo");
view_listener_t::addMenu(new LLAdvancedCheckAnimationInfo(), "Advanced.CheckAnimationInfo");
view_listener_t::addMenu(new LLAdvancedToggleShowLookAt(), "Advanced.ToggleShowLookAt");
view_listener_t::addMenu(new LLAdvancedToggleShowColor(), "Advanced.ToggleShowColor");
view_listener_t::addMenu(new LLAdvancedCheckShowColor(), "Advanced.CheckShowColor");
view_listener_t::addMenu(new LLAdvancedCheckShowLookAt(), "Advanced.CheckShowLookAt");
view_listener_t::addMenu(new LLAdvancedToggleShowPointAt(), "Advanced.ToggleShowPointAt");
view_listener_t::addMenu(new LLAdvancedCheckShowPointAt(), "Advanced.CheckShowPointAt");

6
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -2858,11 +2858,9 @@
label="Show Color Under Cursor"
name="Show Color Under Cursor">
<menu_item_check.on_check
function="CheckControl"
parameter="DebugShowColor" />
function="Advanced.CheckShowColor" />
<menu_item_check.on_click
function="ToggleControl"
parameter="DebugShowColor" />
function="Advanced.ToggleShowColor" />
</menu_item_check>
<menu_item_check
label="Show Memory"