aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-09-09 23:14:20 -0700
committerMcCabe Maxsted2010-09-10 19:11:22 -0700
commit40718fadb6e1757e5f4466da57c7b649aa54f944 (patch)
tree8c20e873bb778a4e26de68119cea65b94cb3e7f6 /linden/indra/newview
parentUpdated the formatting for group IMs to make it clear they're IMs (diff)
downloadmeta-impy-40718fadb6e1757e5f4466da57c7b649aa54f944.zip
meta-impy-40718fadb6e1757e5f4466da57c7b649aa54f944.tar.gz
meta-impy-40718fadb6e1757e5f4466da57c7b649aa54f944.tar.bz2
meta-impy-40718fadb6e1757e5f4466da57c7b649aa54f944.tar.xz
Removed Object-Object Occlusion shortcut as it interferes with the AO
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml3
1 files changed, 1 insertions, 2 deletions
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 0522981..1de4c94 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
@@ -1344,8 +1344,7 @@
1344 <on_check function="Advanced.CheckWireframe" userdata="" /> 1344 <on_check function="Advanced.CheckWireframe" userdata="" />
1345 </menu_item_check> 1345 </menu_item_check>
1346 <menu_item_check name="Object-Object Occlusion" 1346 <menu_item_check name="Object-Object Occlusion"
1347 label="Object-Object Occlusion" 1347 label="Object-Object Occlusion">
1348 shortcut="control|shift|O">
1349 <on_click function="ToggleControl" 1348 <on_click function="ToggleControl"
1350 userdata="UseOcclusion" /> 1349 userdata="UseOcclusion" />
1351 <on_check control="UseOcclusion" /> 1350 <on_check control="UseOcclusion" />