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

---
 linden/indra/llui/llmenugl.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'linden/indra/llui')

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
-- 
cgit v1.1