From 94a37a078d6f39ceca64c84267ed63e2bae306ba Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 8 Nov 2009 10:21:08 -0700
Subject: Attempted to make the Advanced shortcut play nice with Linux in XUI

---
 ChangeLog.txt                                                |  6 ++++++
 linden/indra/llui/llmenugl.cpp                               | 10 ++++++++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index edb89a8..100adf6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-11-08 McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* Attempted to make the Advanced shortcut play nice with Linux in XUI.
+	  
+	  modified:   linden/indra/llui/llmenugl.cpp
+	  modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+	
+	  
 	* Changed version to 1.20 in other files.
 	
 	  modified:   linden/indra/newview/English.lproj/InfoPlist.strings
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 907777d..8411f41 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -1829,6 +1829,16 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 				
 				std::string shortcut;
 				child->getAttributeString("shortcut", shortcut);
+
+#ifdef LL_LINUX
+				// check for linux-specific shortcut
+				std::string shortcut_linux;
+				if (child->getAttributeString("shortcut_linux", shortcut_linux))
+				{
+					shortcut = shortcut_linux;
+				}
+#endif // LL_LINUX			
+				
 				if (shortcut.find("control") != shortcut.npos)
 				{
 #ifdef LL_DARWIN
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 459bf44..1b36bca 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
@@ -413,7 +413,8 @@
     <menu_item_separator />
     <menu_item_check name="Toggle Advanced Menu" 
                     label="Advanced Menu"
-                    shortcut="control|alt|D">
+                    shortcut="control|alt|D"
+                    shortcut_linux="control|alt|shift|D">
       <on_click function="View.ToggleAdvanced" userdata="" />
       <on_check function="View.CheckAdvanced" />
     </menu_item_check>
-- 
cgit v1.1