From 636c86782b9c8a37996aaf01868f713214c54584 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 22 Sep 2010 16:12:04 -0700
Subject: cleaned up notifications.xml and made global notifications toggle not
 use or modify saved responses

---
 indra/newview/app_settings/cmd_line.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/cmd_line.xml')

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 00d69f805e..962c4e9d36 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -149,7 +149,7 @@
     <key>nonotifications</key>
     <map>
       <key>desc</key>
-      <string>User will not get any notifications. NOTE: All notifications that occur will get added to ignore file for future runs.</string>
+      <string>User will not get any notifications.</string>
       <key>map-to</key>
       <string>IgnoreAllNotifications</string>      
     </map>    
-- 
cgit v1.2.3


From 95ecad54c6f037910a5a22f7ef30026cf628fe80 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 28 Sep 2010 16:52:56 -0700
Subject: EXP-112 Enable fullscreen mode (with mode switch, not resize to
 desktop) as per 1.x viewer.

---
 indra/newview/app_settings/cmd_line.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/app_settings/cmd_line.xml')

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 962c4e9d36..aa2f1c41d2 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -391,5 +391,13 @@
       <string>CrashOnStartup</string>
     </map>
 
+    <key>fullscreen</key>
+    <map>
+      <key>desc</key>
+      <string>Force full screen mode</string>
+      <key>map-to</key>
+      <string>WindowFullScreen</string>
+    </map>
+
   </map>
 </llsd>
-- 
cgit v1.2.3


From cf6147f7c092e6ca10697dea341099c5e281df00 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 8 Dec 2010 17:28:27 -0800
Subject: EXP-465 FIX Viewer window does not fill screen on Mac and Linux using
 --fullscreen disabled fullscreen mode for merge to viewer-development

---
 indra/newview/app_settings/cmd_line.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/app_settings/cmd_line.xml')

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 294d85eac1..e4ac455e7c 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -392,13 +392,6 @@
       <string>CrashOnStartup</string>
     </map>
 
-    <key>fullscreen</key>
-    <map>
-      <key>desc</key>
-      <string>Force full screen mode</string>
-      <key>map-to</key>
-      <string>WindowFullScreen</string>
-    </map>
     <key>disablecrashlogger</key>
     <map>
       <key>desc</key>
-- 
cgit v1.2.3