From 8daf25b65c30f58889ed5923d43bf785cb758026 Mon Sep 17 00:00:00 2001
From: "Karl Stiefvater (qarl)" <qarl@lindenlab.com>
Date: Mon, 3 May 2010 15:23:45 -0500
Subject: EXT-6775 Remove support for full-screen mode in Viewer 2.  reviewed
 by davep.

---
 indra/newview/llpanellogin.cpp                     | 6 ------
 indra/newview/llviewermenu.cpp                     | 4 +++-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 ---------
 3 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 529a368dc3..67aea5544d 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -455,12 +455,6 @@ void LLPanelLogin::draw()
 // virtual
 BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
 {
-	if (( KEY_RETURN == key ) && (MASK_ALT == mask))
-	{
-		gViewerWindow->toggleFullscreen(FALSE);
-		return TRUE;
-	}
-
 	if ( KEY_F1 == key )
 	{
 		LLViewerHelp* vhelp = LLViewerHelp::getInstance();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 7c439d7200..7464423f55 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3786,7 +3786,9 @@ class LLViewFullscreen : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		gViewerWindow->toggleFullscreen(TRUE);
+		// we no longer permit full screen mode EXT-6775
+		// gViewerWindow->toggleFullscreen(TRUE);
+		llwarns << "full screen mode no longer supported" << llendl;
 		return true;
 	}
 };
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index df4f33adf0..eefcabdd39 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1565,15 +1565,6 @@
                 <menu_item_call.on_click
                  function="View.ZoomOut" />
             </menu_item_call>
-            <menu_item_separator/>
-            <menu_item_call
-             label="Toggle Fullscreen"
-             name="Toggle Fullscreen"
-             >
-               <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->
-                <menu_item_call.on_click
-                 function="View.Fullscreen" />
-            </menu_item_call>
         </menu>
         <menu_item_separator/>
         <menu_item_call
-- 
cgit v1.2.3