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

Removed redundant loglevel menu.

ziree 2012-02-20 17:22:59 +01:00
parent 5291223115
commit b8885aa3d2
3 changed files with 0 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llviewermenu.cpp
View File

@ -7523,38 +7523,6 @@ class LLToolsSelectedScriptAction : public view_listener_t
}
};
class SetLogLevel : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
std::string newLevel=userdata.asString();
LLError::ELevel level=LLError::LEVEL_INFO;
if(newLevel=="all")
level=LLError::LEVEL_ALL;
else if(newLevel=="debug")
level=LLError::LEVEL_DEBUG;
else if(newLevel=="error")
level=LLError::LEVEL_ERROR;
else if(newLevel=="info")
level=LLError::LEVEL_INFO;
else if(newLevel=="warn")
level=LLError::LEVEL_WARN;
else if(newLevel=="none")
level=LLError::LEVEL_NONE;
LLError::setDefaultLevel(level);
std::string msg="New debug level: "+newLevel;
LLSD args;
args["MESSAGE"]=msg;
LLNotificationsUtil::add("SystemMessageTip",args);
return true;
}
};
void handle_selected_texture_info(void*)
{
for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
@ -9283,9 +9251,6 @@ void initialize_menus()
view_listener_t::addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
view_listener_t::addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
// Advanced > Debug Level
view_listener_t::addMenu(new SetLogLevel(), "Advanced.SetLogLevel");
// Advanced > HUD Info
view_listener_t::addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");
view_listener_t::addMenu(new LLAdvancedCheckHUDInfo(), "Advanced.CheckHUDInfo");

49
indra/newview/skins/default/xui/en/menu_login.xml
View File

@ -265,54 +265,5 @@
function="Floater.Toggle"
parameter="notifications_console" />
</menu_item_call>
<menu_item_separator />
<menu
create_jump_keys="true"
label="Set Loglevel"
name="Set Loglevel"
tear_off="true">
<menu_item_call
label="All"
name="Debug Level All">
<on_click
function="Advanced.SetLogLevel"
parameter="all" />
</menu_item_call>
<menu_item_call
label="Debug"
name="Debug Level Debug">
<on_click
function="Advanced.SetLogLevel"
parameter="debug" />
</menu_item_call>
<menu_item_call
label="Error"
name="Debug Level Error">
<on_click
function="Advanced.SetLogLevel"
parameter="error" />
</menu_item_call>
<menu_item_call
label="Info (Default)"
name="Debug Level Info">
<on_click
function="Advanced.SetLogLevel"
parameter="info" />
</menu_item_call>
<menu_item_call
label="Warn"
name="Debug Level Warn">
<on_click
function="Advanced.SetLogLevel"
parameter="warn" />
</menu_item_call>
<menu_item_call
label="None"
name="Debug Level None">
<on_click
function="Advanced.SetLogLevel"
parameter="none" />
</menu_item_call>
</menu>
</menu>
</menu_bar>

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

@ -2519,55 +2519,6 @@
END: V1 menu toggle entry -WoLf -->
<menu_item_separator />
<menu
create_jump_keys="true"
label="Set Loglevel"
name="Set Loglevel"
tear_off="true">
<menu_item_call
label="All"
name="Debug Level All">
<on_click
function="Advanced.SetLogLevel"
parameter="all" />
</menu_item_call>
<menu_item_call
label="Debug"
name="Debug Level Debug">
<on_click
function="Advanced.SetLogLevel"
parameter="debug" />
</menu_item_call>
<menu_item_call
label="Error"
name="Debug Level Error">
<on_click
function="Advanced.SetLogLevel"
parameter="error" />
</menu_item_call>
<menu_item_call
label="Info (Default)"
name="Debug Level Info">
<on_click
function="Advanced.SetLogLevel"
parameter="info" />
</menu_item_call>
<menu_item_call
label="Warn"
name="Debug Level Warn">
<on_click
function="Advanced.SetLogLevel"
parameter="warn" />
</menu_item_call>
<menu_item_call
label="None"
name="Debug Level None">
<on_click
function="Advanced.SetLogLevel"
parameter="none" />
</menu_item_call>
</menu>
</menu>
<menu