diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2013-12-03 09:29:01 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2013-12-03 09:29:01 +0200 |
| commit | c0ecaeb5d8121d5cd81e94a646b448b84a475550 (patch) | |
| tree | 975e181102c5bc4b1558d90d06501270242c85eb /indra/newview/skins | |
| parent | b93374e0702b5e69fa8200590da274c49f931fcf (diff) | |
| parent | d3e2573ebd60c67c99644fdcf471c6b8102c302d (diff) | |
merge
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_viewer.xml | 12 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_region_debug.xml | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 6354006b87..7fab89b693 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -3126,18 +3126,6 @@ <menu_item_call.on_click function="Advanced.PrintAgentInfo" /> </menu_item_call> - <menu_item_check - label="Region Debug Console" - name="Region Debug Console" - shortcut="control|shift|`" - use_mac_ctrl="true"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="region_debug_console" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="region_debug_console" /> - </menu_item_check> <menu_item_separator /> <menu_item_check diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 81b2281adb..fea5f1b19f 100755 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -201,4 +201,14 @@ tool_tip="Cancel region restart" top_delta="0" width="150" /> + <button + follows="left|top" + height="20" + label="Region Debug Console" + layout="topleft" + left="10" + name="region_debug_console_btn" + tool_tip="Open Region Debug Console" + top_pad="5" + width="150" /> </panel> |