From 9880134b4d8f11ff24760c1eb43434060e4f35f9 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 16 Dec 2014 19:45:19 -0500
Subject: [PATCH] Feature request: Add the ability to use keyboard shortcuts
 from the login panel, whether or not the login webpage is focused

---
 indra/newview/llviewermedia.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 2050c3983..3c274ff33 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -51,6 +51,7 @@
 #include "llkeyboard.h"
 #include "llmarketplacefunctions.h"
 #include "llmediaentry.h"
+#include "llmenugl.h"
 #include "llmimetypes.h"
 #include "llmutelist.h"
 #include "llnotifications.h"
@@ -2753,25 +2754,28 @@ bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask)
 		// Menu keys should be handled by the menu system and not passed to UI elements, but this is how LLTextEditor and LLLineEditor do it...
 		if( MASK_CONTROL & mask )
 		{
-			if( 'C' == key )
+			if('C' == key)
 			{
 				plugin->copy();
 				result = true;
 			}
-			else
-			if( 'V' == key )
+			else if('V' == key)
 			{
 				plugin->paste();
 				result = true;
 			}
-			else
-			if( 'X' == key )
+			else if('X' == key)
 			{
 				plugin->cut();
 				result = true;
 			}
 		}
-		
+
+		// Singu Note: At the very least, let's allow the login menu to function
+		extern LLMenuBarGL* gLoginMenuBarView;
+		if (gLoginMenuBarView && gLoginMenuBarView->getVisible() && gLoginMenuBarView->handleAcceleratorKey(key, mask))
+			return true;
+
 		if(!result)
 		{