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

STORM-1790 Provide a Develop sub-menu to change the default logging level 

co-authored with Zi Ree
master
Jonathan Yap 2011-12-23 12:06:36 -05:00
parent 570d562f58
commit 8a3aa3f6ca
6 changed files with 139 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -603,6 +603,7 @@ Jonathan Yap
STORM-653
STORM-1737
STORM-1733
STORM-1790
Kadah Coba
STORM-1060
Jondan Lundquist
@ -1254,6 +1255,7 @@ Zi Ree
VWR-1140
VWR-24017
VWR-25588
STORM-1790
Zipherius Turas
VWR-76
VWR-77

6
indra/llcommon/llerror.cpp
View File

@ -617,6 +617,12 @@ namespace LLError
s.defaultLevel = level;
}
ELevel getDefaultLevel()
{
Settings& s = Settings::get();
return s.defaultLevel;
}
void setFunctionLevel(const std::string& function_name, ELevel level)
{
Globals& g = Globals::get();

1
indra/llcommon/llerrorcontrol.h
View File

@ -75,6 +75,7 @@ namespace LLError
LL_COMMON_API void setPrintLocation(bool);
LL_COMMON_API void setDefaultLevel(LLError::ELevel);
LL_COMMON_API ELevel getDefaultLevel();
LL_COMMON_API void setFunctionLevel(const std::string& function_name, LLError::ELevel);
LL_COMMON_API void setClassLevel(const std::string& class_name, LLError::ELevel);
LL_COMMON_API void setFileLevel(const std::string& file_name, LLError::ELevel);

27
indra/newview/llviewermenu.cpp
View File

@ -2203,6 +2203,30 @@ class LLAdvancedEnableToggleHackedGodmode : public view_listener_t
//// Advanced menu
////-------------------------------------------------------------------
//////////////////
// DEVELOP MENU //
//////////////////
class LLDevelopCheckLoggingLevel : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
U32 level = userdata.asInteger();
return (static_cast<LLError::ELevel>(level) == LLError::getDefaultLevel());
}
};
class LLDevelopSetLoggingLevel : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
U32 level = userdata.asInteger();
LLError::setDefaultLevel(static_cast<LLError::ELevel>(level));
return true;
}
};
//////////////////
// ADMIN MENU //
//////////////////
@ -8195,6 +8219,9 @@ void initialize_menus()
view_listener_t::addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
view_listener_t::addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
// Develop >Set logging level
view_listener_t::addMenu(new LLDevelopCheckLoggingLevel(), "Develop.CheckLoggingLevel");
view_listener_t::addMenu(new LLDevelopSetLoggingLevel(), "Develop.SetLoggingLevel");
// Admin >Object
view_listener_t::addMenu(new LLAdminForceTakeCopy(), "Admin.ForceTakeCopy");

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

@ -174,7 +174,58 @@
function="Advanced.WebContentTest"
parameter="http://google.com"/>
</menu_item_call>
<menu_item_check
<menu
create_jump_keys="true"
label="Set Logging Level"
name="Set Logging Level"
tear_off="true">
<menu_item_check
label="Debug">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="0" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="0" />
</menu_item_check>
<menu_item_check
label="Info">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="1" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="1" />
</menu_item_check>
<menu_item_check
label="Warning">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="2" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="2" />
</menu_item_check>
<menu_item_check
label="Error">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="3" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="3" />
</menu_item_check>
<menu_item_check
label="None">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="4" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="4" />
</menu_item_check>
</menu>
<menu_item_check
label="Show Grid Picker"
name="Show Grid Picker"
visible="false"

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

@ -3367,6 +3367,57 @@
function="ToggleControl"
parameter="ShowConsoleWindow" />
</menu_item_check>
<menu
create_jump_keys="true"
label="Set Logging Level"
name="Set Logging Level"
tear_off="true">
<menu_item_check
label="Debug">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="0" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="0" />
</menu_item_check>
<menu_item_check
label="Info">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="1" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="1" />
</menu_item_check>
<menu_item_check
label="Warning">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="2" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="2" />
</menu_item_check>
<menu_item_check
label="Error">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="3" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="3" />
</menu_item_check>
<menu_item_check
label="None">
<menu_item_check.on_check
function="Develop.CheckLoggingLevel"
parameter="4" />
<menu_item_check.on_click
function="Develop.SetLoggingLevel"
parameter="4" />
</menu_item_check>
</menu>
<menu_item_separator/>