From 59ecef5a9707c1475712d89501cd512b04dbd9fd Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 9 Jun 2011 23:47:03 +0300
Subject: Fix #924: default RunMultipleThreads to TRUE.

This should work around the 5% FPS slowdown caused by #614 and is
generally a good idea (unless it causes problems, in which case it's
definetely a bad idea).
---
 linden/indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/app_settings')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e571988..41b9fcf 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -10580,7 +10580,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>SafeMode</key>
     <map>
-- 
cgit v1.1


From 87219855c664447a39dd7c2d8866f0a630d1c843 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 14 Jun 2011 22:24:53 -0500
Subject: Reverted ability to customize the Imprudence client tag color.

The Imprudence tag color is part of our official branding. Users can
turn it off, but the color itself is not a matter of user preference.

This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233
and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two
widgets from Preferences > Colors.
---
 linden/indra/newview/app_settings/settings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'linden/indra/newview/app_settings')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 166c35a..1fd8d6f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1737,22 +1737,6 @@
 
   <!-- Begin: Client Name Tag -->
 
-  <key>ImprudenceTagColor</key>
-  <map>
-    <key>Comment</key>
-    <string>Color of Imprudence tags (displayed only locally)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Color4</string>
-    <key>Value</key>
-    <array>
-      <real>0.79</real>
-      <real>0.44</real>
-      <real>0.88</real>
-      <real>1</real>
-    </array>
-  </map>
   <key>ShowClientColor</key>
   <map>
     <key>Comment</key>
-- 
cgit v1.1


From 8640681b493a4b4d9ae1d8ee6774778360b39e4a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 15 Jun 2011 03:04:54 -0500
Subject: Removed Aurora Grid from the default grid list.

It's only a testing/development grid, not intended for real use.
---
 linden/indra/newview/app_settings/default_grids.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'linden/indra/newview/app_settings')

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index dab575b..cd76ea7 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -62,21 +62,6 @@
       <key>version</key><string>3</string>
     </map>
 
-    <!-- Aurora Grid -->
-    <map>
-      <key>gridname</key>   <string>Aurora-Grid</string>
-      <key>gridnick</key>   <string>auroragrid</string>
-      <key>platform</key>   <string>OpenSim</string>
-      <key>loginuri</key>   <string>http://login.aurora-sim.org:8002/</string>
-      <key>loginpage</key>  <string>http://login.aurora-sim.org/splash/</string>
-      <key>helperuri</key>  <string>http://grid.aurora-sim.org/</string>
-      <key>password</key>   <string />
-      <key>register</key>   <string />
-      <key>support</key>    <string>http://forum.aurora-sim.org/</string>
-      <key>website</key>    <string>http://aurora-sim.org</string>
-      <key>version</key>    <string>0</string>
-    </map>
-
     <!-- WorldSimTerra -->
     <map>
       <key>gridnick</key><string>worldsimterra</string>
-- 
cgit v1.1


From ee38f7a26407f998352df80b6eb27d416a6a061b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 15 Jun 2011 17:44:38 -0500
Subject: Removed Meta7 and WorldSimTerra from default_grids.xml.

Meta7 is definitely gone, WorldSimTerra seems to be, too.
---
 .../indra/newview/app_settings/default_grids.xml   | 32 +---------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'linden/indra/newview/app_settings')

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index cd76ea7..c5ef948 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>37</string>
+      <key>default_grids_version</key><string>38</string>
     </map>
 
     <!-- Second Life -->
@@ -62,21 +62,6 @@
       <key>version</key><string>3</string>
     </map>
 
-    <!-- WorldSimTerra -->
-    <map>
-      <key>gridnick</key><string>worldsimterra</string>
-      <key>gridname</key><string>WorldSimTerra</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://wsterra.com:8002</string>
-      <key>loginpage</key><string>http://wsterra.com/log.php</string>
-      <key>helperuri</key><string>http://wsterra.com/</string>
-      <key>website</key><string>http://www.worldsimterra.com/</string>
-      <key>support</key><string>http://www.worldsimterra.com/</string>
-      <key>register</key><string>http://www.worldsimterra.com/</string>
-      <key>password</key><string>http://www.worldsimterra.com/</string>
-      <key>version</key><string>0</string>
-    </map>
-
     <!-- Your Alternative Life -->
     <map>
       <key>gridnick</key><string>youralternativelife</string>
@@ -196,21 +181,6 @@
       <key>version</key>   <string>2</string>
     </map> 
 
-    <!-- Meta7 -->
-    <map>
-      <key>gridname</key>  <string>Meta7</string>
-      <key>gridnick</key>  <string>meta7</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://login.meta7.com/</string>
-      <key>loginpage</key> <string>http://api.meta7.com/loginscreen.php</string>
-      <key>helperuri</key> <string>https://secure.meta7.com/</string>
-      <key>password</key>  <string>http://www.meta7.com/resetpass.php</string>
-      <key>register</key>  <string>http://www.meta7.com/register.php</string>
-      <key>support</key>   <string>http://www.meta7.com/support.php</string>
-      <key>website</key>   <string>http://meta7.com/</string>
-      <key>version</key>   <string>0</string>
-    </map>
-
     <!-- ScienceSim -->
     <map>
       <key>gridname</key>  <string>IEEE/ACM ScienceSim Virtual World</string>
-- 
cgit v1.1


From 752588152dc9c60f1aba63ee60ea21473e3243db Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 16 Jun 2011 00:18:11 -0500
Subject: Fixed DicDownloadBaseURL to use http://app.kokuaviewer.org.

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

(limited to 'linden/indra/newview/app_settings')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1fd8d6f..a6b782d 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2069,7 +2069,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://kokuaviewer.org/app/dics/</string>
+    <string>http://app.kokuaviewer.org/dics/</string>
   </map>
   <key>EmeraldEnableAutoCorrect</key>
   <map>
-- 
cgit v1.1