From 40718fadb6e1757e5f4466da57c7b649aa54f944 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 9 Sep 2010 23:14:20 -0700
Subject: Removed Object-Object Occlusion shortcut as it interferes with the AO

---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 3 +--
 1 file changed, 1 insertion(+), 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 @@
         <on_check function="Advanced.CheckWireframe" userdata="" />
       </menu_item_check>
       <menu_item_check name="Object-Object Occlusion"
-                       label="Object-Object Occlusion"
-                       shortcut="control|shift|O">
+                       label="Object-Object Occlusion">
         <on_click function="ToggleControl"
                   userdata="UseOcclusion" />
         <on_check control="UseOcclusion" />
-- 
cgit v1.1