diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 18:42:49 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 18:42:49 -0700 |
| commit | 93b7f615bc8d1bc6f928eeba7d0412455af6b478 (patch) | |
| tree | 2a3b6470a0bcc2e0359b75679dab3ee92297c317 /indra/newview/skins | |
| parent | dbe0a577ae09f500373c104e038a7d64dd9e3002 (diff) | |
Moving the debug materials floater under the Develop menu and renaming.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_debug_materials.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml index d7ec5d5e7c..0c4d311c0f 100644 --- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml +++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml @@ -12,7 +12,7 @@ reuse_instance="true" save_rect="false" single_instance="true" - title="Stinson Test"> + title="Debug materials"> <floater.string name="status_no_region">No current region available.</floater.string> <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string> <floater.string name="status_ready">Materials are enabled for this region.</floater.string> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 785ae8f366..8b47f3a25d 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -989,16 +989,6 @@ <menu_item_separator/> - <menu_item_call - label="Stinson" - name="StinsonMenu"> - <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="debug_materials" /> - </menu_item_call> - - <menu_item_separator/> - <menu create_jump_keys="true" label="Options" @@ -2621,6 +2611,17 @@ <menu_item_check.on_enable function="Advanced.EnableRenderDeferredOptions" /> </menu_item_check> + + <menu_item_separator/> + + <menu_item_call + label="Debug materials ..." + name="DebugMaterialsMenu"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="debug_materials" /> + </menu_item_call> + <menu_item_separator /> <menu_item_check |