aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-05-25 11:59:42 +1000
committerDavid Walter Seikel2013-05-25 11:59:42 +1000
commit0d5f83ff72ab0604d06993bce035989804fef1ec (patch)
treefee3a63c1eac1a785802510aa5e0c3745cb34e83
parentWhite space fix. (diff)
downloadmeta-impy-0d5f83ff72ab0604d06993bce035989804fef1ec.zip
meta-impy-0d5f83ff72ab0604d06993bce035989804fef1ec.tar.gz
meta-impy-0d5f83ff72ab0604d06993bce035989804fef1ec.tar.bz2
meta-impy-0d5f83ff72ab0604d06993bce035989804fef1ec.tar.xz
Dump hotkeys for obscure debugging stuff, to free them up for other things.
-rw-r--r--linden/indra/newview/llviewermenu.cpp8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml14
2 files changed, 8 insertions, 14 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 1ee00d0..0f6e5c4 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1098,10 +1098,10 @@ void init_debug_ui_menu(LLMenuGL* menu)
1098 menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui)); 1098 menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
1099 menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr)); 1099 menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
1100 menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory)); 1100 menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
1101 menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL)); 1101 menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus));
1102 menu->append(new LLMenuItemCallGL( "Print Selected Object Info", &print_object_info, NULL, NULL, 'P', MASK_CONTROL|MASK_SHIFT )); 1102 menu->append(new LLMenuItemCallGL( "Print Selected Object Info", &print_object_info));
1103 menu->append(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT )); 1103 menu->append(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs));
1104 menu->append(new LLMenuItemCallGL( "Memory Stats", &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL)); 1104 menu->append(new LLMenuItemCallGL( "Memory Stats", &output_statistics));
1105 menu->append(new LLMenuItemCheckGL("Double-Click Auto-Pilot", 1105 menu->append(new LLMenuItemCheckGL("Double-Click Auto-Pilot",
1106 menu_toggle_control, NULL, menu_check_control, 1106 menu_toggle_control, NULL, menu_check_control,
1107 (void*)"DoubleClickAutoPilot")); 1107 (void*)"DoubleClickAutoPilot"));
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index bace111..46a2c81 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1654,23 +1654,17 @@
1654 <menu_item_call name="Dump Inventory" label="Dump Inventory"> 1654 <menu_item_call name="Dump Inventory" label="Dump Inventory">
1655 <on_click function="Advanced.DumpInventory" userdata="" /> 1655 <on_click function="Advanced.DumpInventory" userdata="" />
1656 </menu_item_call> 1656 </menu_item_call>
1657 <menu_item_call name="Dump Focus Holder" 1657 <menu_item_call name="Dump Focus Holder" label="Dump Focus Holder">
1658 label="Dump Focus Holder"
1659 shortcut="control|alt|F">
1660 <on_click function="Advanced.DumpFocusHolder" userdata="" /> 1658 <on_click function="Advanced.DumpFocusHolder" userdata="" />
1661 </menu_item_call> 1659 </menu_item_call>
1662 <menu_item_call name="Print Selected Object Info" 1660 <menu_item_call name="Print Selected Object Info" label="Print Selected Object Info">
1663 label="Print Selected Object Info"
1664 shortcut="control|shift|P">
1665 <on_click function="Advanced.PrintSelectedObjectInfo" 1661 <on_click function="Advanced.PrintSelectedObjectInfo"
1666 userdata="" /> 1662 userdata="" />
1667 </menu_item_call> 1663 </menu_item_call>
1668 <menu_item_call name="Print Agent Info" 1664 <menu_item_call name="Print Agent Info" label="Print Agent Info">
1669 label="Print Agent Info" shortcut="shift|P">
1670 <on_click function="Advanced.PrintAgentInfo" userdata="" /> 1665 <on_click function="Advanced.PrintAgentInfo" userdata="" />
1671 </menu_item_call> 1666 </menu_item_call>
1672 <menu_item_call name="Memory Stats" label="Memory Stats" 1667 <menu_item_call name="Memory Stats" label="Memory Stats">
1673 shortcut="control|alt|shift|M">
1674 <on_click function="Advanced.PrintTextureMemoryStats" 1668 <on_click function="Advanced.PrintTextureMemoryStats"
1675 userdata="" /> 1669 userdata="" />
1676 </menu_item_call> 1670 </menu_item_call>