From 75065e71171161d5113345f80b062e74c66a41f4 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 26 Oct 2009 15:48:26 -0500
Subject: Moved Logout to Advanced menu, removed shortcut.

We want to discourage its use until issues are fixed in 1.3.
---
 ChangeLog.txt                                                | 6 ++++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index fb74445..b953065 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-10-26  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* Moved "Logout" to Advanced menu, removed shortcut.
+	  We want to discourage its use until issues are fixed in 1.3.
+
+	  modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
 	* Capped chat channel spinner to 1000000 (1 mil) as temp fix.
 	  Very high numbers cause mysterious rounding problems.
 
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 222a9ad..459bf44 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
@@ -74,10 +74,6 @@
                 userdata="" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Logout" label="Logout"
-                    shortcut="control|alt|Q">
-          <on_click function="File.Logout" userdata="" />
-    </menu_item_call>
     <menu_item_call name="Quit" label="Quit"
                     shortcut="control|Q">
       <on_click function="File.Quit" userdata="" />
@@ -2016,6 +2012,9 @@
       <on_check function="Advanced.CheckMultipleViewers"
                 userdata="" />
     </menu_item_check>
+    <menu_item_call name="Logout" label="Logout (unstable)">
+      <on_click function="File.Logout" userdata="" />
+    </menu_item_call>
     <menu_item_call name="Debug Settings"
                     label="Debug Settings">
       <on_click function="Advanced.ShowDebugSettings"
-- 
cgit v1.1