From 8de9883c97375c42a70b415a75f7eee6553c0a9c Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Thu, 3 Mar 2011 08:54:14 +1000
Subject: No need for the default grid selector, this is the meta 7 viewer, the
 default grid is meta 7.

---
 linden/indra/newview/app_settings/settings.xml | 6 +++---
 linden/indra/newview/llfirstuse.cpp            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index fb2e78c..988653e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -676,7 +676,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string />
+    <string>meta7</string>
   </map>
   <key>LegacyPieEnabled</key>
   <map>
@@ -1353,7 +1353,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>WarnFirstMiniMap</key>
   <map>
@@ -6733,7 +6733,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>ForceMandatoryUpdate</key>
   <map>
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index f482d1c..bae1ff4 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -370,8 +370,8 @@ void LLFirstUse::useLoginScreen()
 	{
 		gSavedSettings.setWarning("FirstLoginScreen", FALSE);
 
-		FloaterGridDefault::getInstance()->open();
-		FloaterGridDefault::getInstance()->center();
+//		FloaterGridDefault::getInstance()->open();
+//		FloaterGridDefault::getInstance()->center();
 	}
 }
 
-- 
cgit v1.1