From e045d212d35354d679c2d2e05c6d4689f9f8ac95 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 27 Sep 2010 22:56:08 -0400
Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass
 at merging in windlight estate settings to viewer-dev codebase.

not built, not tested. Probably needs a bunch of fixes to be able
to be integrated.

(resubmitted by Vadim ProductEngine)
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 742a20a849..d21e978ca5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11046,6 +11046,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>UseEnvironmentFromRegion</key>
+    <map>
+      <key>Comment</key>
+      <string>Choose whether to use the region's environment settings, or override them with the local settings.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>UseExternalBrowser</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From fa87eaa1b0fef33ace91862bef0ae722cab124e8 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 18 Apr 2011 22:10:39 +0300
Subject: STORM-1170 FIX Enabled using region environment settings by default.

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 90967f3af8..ccaaf8d9c4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11342,7 +11342,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>UseExternalBrowser</key>
     <map>
-- 
cgit v1.2.3


From 81676d4753a1abe347a69a95f234a005aad0659f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 18 Apr 2011 15:58:03 -0400
Subject: storm-160: revert latest fixes to prevent conflicts with windlight

---
 indra/newview/app_settings/settings.xml | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d98f0da1c2..d412b82e95 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11926,33 +11926,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>WaterFogColor</key>
-    <map>
-      <key>Comment</key>
-      <string>Water fog color</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Color4</string>
-      <key>Value</key>
-      <array>
-        <real>0.0863</real>
-        <real>0.168</real>
-        <real>0.212</real>
-        <real>0</real>
-      </array>
-    </map>
-    <key>WaterFogDensity</key>
-    <map>
-      <key>Comment</key>
-      <string>Water fog density</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>16.0</real>
-    </map>
     <key>WaterGLFogDensityScale</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 0d7ea0e5abb4df0a18f1d8b73cce81dc2070afad Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 13 May 2011 19:20:18 +0300
Subject: STORM-1200 FIXED Created fixed sun presets: Sunrise, Midday, Sunset,
 Midnight.

---
 .../app_settings/windlight/skies/Midday.xml        | 141 ++++++++++++++++++++
 .../app_settings/windlight/skies/Midnight.xml      | 141 ++++++++++++++++++++
 .../app_settings/windlight/skies/Sunrise.xml       | 141 ++++++++++++++++++++
 .../app_settings/windlight/skies/Sunset.xml        | 142 +++++++++++++++++++++
 4 files changed, 565 insertions(+)
 create mode 100644 indra/newview/app_settings/windlight/skies/Midday.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Midnight.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Sunrise.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Sunset.xml

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/windlight/skies/Midday.xml b/indra/newview/app_settings/windlight/skies/Midday.xml
new file mode 100644
index 0000000000..119b3e1418
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Midday.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24475815892219543</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381567001343</real>
+            <real>0.49548381567001343</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000001192092896</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1605</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.7342105507850647</real>
+            <real>0.78157895803451538</real>
+            <real>0.89999997615814209</real>
+            <real>0.29999998211860657</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Midnight.xml b/indra/newview/app_settings/windlight/skies/Midnight.xml
new file mode 100644
index 0000000000..0aba31214a
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Midnight.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.20405027270317078</real>
+            <real>0.24246673285961151</real>
+            <real>0.32999998331069946</real>
+            <real>0.10999999940395355</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.87999999523162842</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00030000001424923539</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.8876205482883961e-007</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.20001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.7123894691467285</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.34876692295074463</real>
+            <real>0.35574248433113098</real>
+            <real>0.65999996662139893</real>
+            <real>0.2199999988079071</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Sunrise.xml b/indra/newview/app_settings/windlight/skies/Sunrise.xml
new file mode 100644
index 0000000000..bbc7aeec59
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Sunrise.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.80999994277954102</real>
+            <real>0.46289783716201782</real>
+            <real>0.62999993562698364</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.15793180465698242</real>
+            <real>0.43499568104743958</real>
+            <real>0.87000000476837158</real>
+            <real>0.87000000476837158</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.20673196017742157</real>
+            <real>0.40988314151763916</real>
+            <real>0.47999998927116394</real>
+            <real>0.47999998927116394</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.99997219085526012</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000025272481253</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013883861</real>
+            <real>10.010999679576344</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00062000000616535544</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.6999279499073054</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0009990693069994</real>
+            <real>0.0010000000474963411</real>
+            <real>-0.48000101923815919</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.094108223915100098</real>
+            <real>0.99556195735931396</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>563</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.094247691333293915</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.369999885559082</real>
+            <real>2.369999885559082</real>
+            <real>2.369999885559082</real>
+            <real>0.78999996185302734</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Sunset.xml b/indra/newview/app_settings/windlight/skies/Sunset.xml
new file mode 100644
index 0000000000..ebf08e1a3f
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Sunset.xml
@@ -0,0 +1,142 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0199999809265137</real>
+            <real>0.80999994277954102</real>
+            <real>0.80999994277954102</real>
+            <real>1.0199999809265137</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.10767599940299988</real>
+            <real>0.21348699927330017</real>
+            <real>0.25</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.87999999523162842</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00046000001020729542</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.07532646507024765</real>
+            <real>-0.99715894460678101</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>562.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0661947727203369</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
+
-- 
cgit v1.2.3


From ff3289e2f3a8e87ce33cb267ad30b4a431406f9e Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Fri, 13 May 2011 13:56:49 -0700
Subject: ER-898: Modify llGetParcelDetails() on viewer to support parcel
 privacy.  Reviewed by Kelly.

---
 indra/newview/app_settings/keywords.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 263b73ba23..6426d5c2a8 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -498,6 +498,7 @@ PARCEL_DETAILS_OWNER	Used with llGetParcelDetails to get the parcel owner id.
 PARCEL_DETAILS_GROUP	Used with llGetParcelDetails to get the parcel group id.
 PARCEL_DETAILS_AREA		Used with llGetParcelDetails to get the parcel area in square meters.
 PARCEL_DETAILS_ID		Used with llGetParcelDetails to get the parcel id.
+PARCEL_DETAILS_PRIVACY	Used with llGetParcelDetails to get the parcel privacy setting.
 
 STRING_TRIM_HEAD		Used with llStringTrim to trim leading spaces from a string.
 STRING_TRIM_TAIL		Used with llStringTrim to trim trailing spaces from a string.
-- 
cgit v1.2.3


From cccca566bd2365c88cca819729c5432af9dfa52f Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 16 May 2011 17:17:01 +0300
Subject: STORM-1245 WIP Reimplementing management of local presets according
 to the new spec.

User environment preferences are now persistent.

TODO: Implement applying region env. settings.
---
 indra/newview/app_settings/settings.xml | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3c02cd1b8c..29476b5e71 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11333,6 +11333,50 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>UseDayCycle</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether to use use a day cycle or a fixed sky.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>WaterPresetName</key>
+    <map>
+      <key>Comment</key>
+      <string>Water preset to use. May be superseded by region settings.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Default</string>
+    </map>
+    <key>SkyPresetName</key>
+    <map>
+      <key>Comment</key>
+      <string>Sky preset to use. May be superseded by region settings or by a day cycle (see DayCycleName).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Default</string>
+    </map>
+    <key>DayCycleName</key>
+    <map>
+      <key>Comment</key>
+      <string>Day cycle to use. May be superseded by region settings.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Default</string>
+    </map>
     <key>UseExternalBrowser</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 0f02f6784d0bc2a9cf72674da0b7bf2262ca8b58 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 25 May 2011 13:57:16 -0400
Subject: storm-1189: remove classic clouds

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a3b8ee177a..d1d64516f9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10187,17 +10187,6 @@
         <real>0.1</real>
       </array>
     </map>
-    <key>SkyUseClassicClouds</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether to use the old Second Life particle clouds or not</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>SnapEnabled</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 4b348d00653b75ea6350ab72c50a5ddba561d11f Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 2 Jun 2011 13:09:43 +0300
Subject: STORM-1253 WIP Adding sample day cycles provided by Torley.

---
 .../app_settings/windlight/days/Colder%20Tones.xml | 28 +++++++++
 .../windlight/days/Dynamic%20Richness.xml          | 32 ++++++++++
 .../windlight/days/Pirate%27s%20Dream.xml          | 44 +++++++++++++
 .../windlight/days/Psycho%20Strobe%21.xml          | 72 ++++++++++++++++++++++
 .../app_settings/windlight/days/Tropicalia.xml     | 32 ++++++++++
 .../app_settings/windlight/days/Weird-O.xml        | 56 +++++++++++++++++
 6 files changed, 264 insertions(+)
 create mode 100644 indra/newview/app_settings/windlight/days/Colder%20Tones.xml
 create mode 100644 indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
 create mode 100644 indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
 create mode 100644 indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
 create mode 100644 indra/newview/app_settings/windlight/days/Tropicalia.xml
 create mode 100644 indra/newview/app_settings/windlight/days/Weird-O.xml

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/windlight/days/Colder%20Tones.xml b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
new file mode 100644
index 0000000000..5ab6d04e6e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
@@ -0,0 +1,28 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Midnight</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>Purple</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Blue Midday</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Blizzard</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Ghost</string>
+        </array>
+        <array>
+            <real>0.99999958276748657</real>
+            <string>Midnight</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
new file mode 100644
index 0000000000..64090957e8
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
@@ -0,0 +1,32 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Night</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>Blizzard</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>Sunrise</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Midday 3</string>
+        </array>
+        <array>
+            <real>0.68749970197677612</real>
+            <string>Pirate</string>
+        </array>
+        <array>
+            <real>0.81249970197677612</real>
+            <string>Coastal Sunset</string>
+        </array>
+        <array>
+            <real>0.99999958276748657</real>
+            <string>Midnight</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
new file mode 100644
index 0000000000..5e08cef061
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
@@ -0,0 +1,44 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>A-12AM</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>A-3AM</string>
+        </array>
+        <array>
+            <real>0.22222213447093964</real>
+            <string>Barcelona</string>
+        </array>
+        <array>
+            <real>0.30208322405815125</real>
+            <string>Sunrise</string>
+        </array>
+        <array>
+            <real>0.37499985098838806</real>
+            <string>Sailor&apos;s Delight</string>
+        </array>
+        <array>
+            <real>0.53819423913955688</real>
+            <string>Coastal Afternoon</string>
+        </array>
+        <array>
+            <real>0.63194417953491211</real>
+            <string>Pirate</string>
+        </array>
+        <array>
+            <real>0.7048608660697937</real>
+            <string>Desert Sunset</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Coastal Sunset</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Blizzard</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
new file mode 100644
index 0000000000..001ab83fc3
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
@@ -0,0 +1,72 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.062499973922967911</real>
+            <string>A-12AM</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.18749992549419403</real>
+            <string>A-3AM</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.31249985098838806</real>
+            <string>A-6AM</string>
+        </array>
+        <array>
+            <real>0.37499985098838806</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.43749979138374329</real>
+            <string>A-9AM</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.5624997615814209</real>
+            <string>A-12PM</string>
+        </array>
+        <array>
+            <real>0.62499970197677612</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.68749970197677612</real>
+            <string>A-3PM</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.81249970197677612</real>
+            <string>A-6PM</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.93749958276748657</real>
+            <string>A-9PM</string>
+        </array>
+        <array>
+            <real>0.99999958276748657</real>
+            <string>Sheer Surreality</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Tropicalia.xml b/indra/newview/app_settings/windlight/days/Tropicalia.xml
new file mode 100644
index 0000000000..b04d20c6ec
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Tropicalia.xml
@@ -0,0 +1,32 @@
+<llsd>
+    <array>
+        <array>
+            <real>0.062499973922967911</real>
+            <string>Purple</string>
+        </array>
+        <array>
+            <real>0.16666659712791443</real>
+            <string>Funky Funky</string>
+        </array>
+        <array>
+            <real>0.31249985098838806</real>
+            <string>Sunrise</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Fine Day</string>
+        </array>
+        <array>
+            <real>0.66666638851165771</real>
+            <string>Desert Sunset</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Sailor&apos;s Delight</string>
+        </array>
+        <array>
+            <real>0.95833295583724976</real>
+            <string>Midnight</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Weird-O.xml b/indra/newview/app_settings/windlight/days/Weird-O.xml
new file mode 100644
index 0000000000..51ba41ae02
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Weird-O.xml
@@ -0,0 +1,56 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Funky Funky</string>
+        </array>
+        <array>
+            <real>0.13194438815116882</real>
+            <string>Funky Funky Funky</string>
+        </array>
+        <array>
+            <real>0.26041656732559204</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.40624985098838806</real>
+            <string>Funky Funky Funky</string>
+        </array>
+        <array>
+            <real>0.43749979138374329</real>
+            <string>Ghost</string>
+        </array>
+        <array>
+            <real>0.46874979138374329</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.5486108660697937</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.6076386570930481</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.68055528402328491</real>
+            <string>Ghost</string>
+        </array>
+        <array>
+            <real>0.75694411993026733</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.87847185134887695</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.91319411993026733</real>
+            <string>Funky Funky Funky</string>
+        </array>
+        <array>
+            <real>0.96527737379074097</real>
+            <string>Funky Funky Funky</string>
+        </array>
+    </array>
+</llsd>
-- 
cgit v1.2.3


From 9d1c1c496831fdeacfec0d762d5203a3067e8f77 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 6 Jun 2011 15:56:44 +0300
Subject: STORM-1253 WIP Made the triangle 50% larger.

---
 indra/newview/app_settings/settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3db2259c62..199ce9c30d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10801,7 +10801,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>-2</real>
+      <real>-1</real>
     </map>
     <key>UIExtraTriangleWidth</key>
     <map>
@@ -10812,7 +10812,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>2</real>
+      <real>4</real>
     </map>
     <key>UIFloaterCloseBoxSize</key>
     <map>
-- 
cgit v1.2.3


From cf31723a1a258e0452dd26d9f5eb5fcdac290e05 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 6 Jun 2011 17:12:17 -0700
Subject: EXP-844	INITIAL CHECKIN - FUNCTION DISABLED - As a first time
 user I would like to see a video after I log in that highlights the best
 features of Second Life

---
 indra/newview/app_settings/settings.xml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index cf5f522519..218a0534e6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6535,8 +6535,29 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-
-    <key>PrecachingDelay</key>
+   <key>PostFirstLoginIntroURL</key>
+   <map>
+     <key>Comment</key>
+     <string>URL of intro presenatation after first time users first login</string>
+     <key>Persist</key>
+     <integer>1</integer>
+     <key>Type</key>
+     <string>String</string>
+     <key>Value</key>
+     <string></string>
+   </map>
+  <key>PostFirstLoginIntroViewed</key>
+  <map>
+    <key>Comment</key>
+    <string>Flag indicating if user has seen intro presenatation after first time users first login</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <string>0</string>
+  </map>
+  <key>PrecachingDelay</key>
     <map>
       <key>Comment</key>
       <string>Delay when logging in to load world before showing it (seconds)</string>
-- 
cgit v1.2.3


From f5dfd0a2b38b430e6bc5dd3cec5241b949da0333 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 10 Jun 2011 09:57:42 -0400
Subject: fix DOS line endings

---
 .../app_settings/windlight/days/Colder%20Tones.xml |  56 ++++----
 .../windlight/days/Dynamic%20Richness.xml          |  64 ++++-----
 .../windlight/days/Pirate%27s%20Dream.xml          |  88 ++++++-------
 .../windlight/days/Psycho%20Strobe%21.xml          | 144 ++++++++++-----------
 .../app_settings/windlight/days/Tropicalia.xml     |  64 ++++-----
 .../app_settings/windlight/days/Weird-O.xml        | 112 ++++++++--------
 6 files changed, 264 insertions(+), 264 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/windlight/days/Colder%20Tones.xml b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
index 5ab6d04e6e..63d0b099e1 100644
--- a/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
+++ b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
@@ -1,28 +1,28 @@
-<llsd>
-    <array>
-        <array>
-            <real>0</real>
-            <string>Midnight</string>
-        </array>
-        <array>
-            <real>0.24999989569187164</real>
-            <string>Purple</string>
-        </array>
-        <array>
-            <real>0.49999979138374329</real>
-            <string>Blue Midday</string>
-        </array>
-        <array>
-            <real>0.74999970197677612</real>
-            <string>Blizzard</string>
-        </array>
-        <array>
-            <real>0.87499958276748657</real>
-            <string>Ghost</string>
-        </array>
-        <array>
-            <real>0.99999958276748657</real>
-            <string>Midnight</string>
-        </array>
-    </array>
-</llsd>
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Midnight</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>Purple</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Blue Midday</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Blizzard</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Ghost</string>
+        </array>
+        <array>
+            <real>0.99999958276748657</real>
+            <string>Midnight</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
index 64090957e8..f75b52e6ed 100644
--- a/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
+++ b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
@@ -1,32 +1,32 @@
-<llsd>
-    <array>
-        <array>
-            <real>0</real>
-            <string>Night</string>
-        </array>
-        <array>
-            <real>0.12499994784593582</real>
-            <string>Blizzard</string>
-        </array>
-        <array>
-            <real>0.24999989569187164</real>
-            <string>Sunrise</string>
-        </array>
-        <array>
-            <real>0.49999979138374329</real>
-            <string>Midday 3</string>
-        </array>
-        <array>
-            <real>0.68749970197677612</real>
-            <string>Pirate</string>
-        </array>
-        <array>
-            <real>0.81249970197677612</real>
-            <string>Coastal Sunset</string>
-        </array>
-        <array>
-            <real>0.99999958276748657</real>
-            <string>Midnight</string>
-        </array>
-    </array>
-</llsd>
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Night</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>Blizzard</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>Sunrise</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Midday 3</string>
+        </array>
+        <array>
+            <real>0.68749970197677612</real>
+            <string>Pirate</string>
+        </array>
+        <array>
+            <real>0.81249970197677612</real>
+            <string>Coastal Sunset</string>
+        </array>
+        <array>
+            <real>0.99999958276748657</real>
+            <string>Midnight</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
index 5e08cef061..6dc1ba9f4d 100644
--- a/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
+++ b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
@@ -1,44 +1,44 @@
-<llsd>
-    <array>
-        <array>
-            <real>0</real>
-            <string>A-12AM</string>
-        </array>
-        <array>
-            <real>0.12499994784593582</real>
-            <string>A-3AM</string>
-        </array>
-        <array>
-            <real>0.22222213447093964</real>
-            <string>Barcelona</string>
-        </array>
-        <array>
-            <real>0.30208322405815125</real>
-            <string>Sunrise</string>
-        </array>
-        <array>
-            <real>0.37499985098838806</real>
-            <string>Sailor&apos;s Delight</string>
-        </array>
-        <array>
-            <real>0.53819423913955688</real>
-            <string>Coastal Afternoon</string>
-        </array>
-        <array>
-            <real>0.63194417953491211</real>
-            <string>Pirate</string>
-        </array>
-        <array>
-            <real>0.7048608660697937</real>
-            <string>Desert Sunset</string>
-        </array>
-        <array>
-            <real>0.74999970197677612</real>
-            <string>Coastal Sunset</string>
-        </array>
-        <array>
-            <real>0.87499958276748657</real>
-            <string>Blizzard</string>
-        </array>
-    </array>
-</llsd>
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>A-12AM</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>A-3AM</string>
+        </array>
+        <array>
+            <real>0.22222213447093964</real>
+            <string>Barcelona</string>
+        </array>
+        <array>
+            <real>0.30208322405815125</real>
+            <string>Sunrise</string>
+        </array>
+        <array>
+            <real>0.37499985098838806</real>
+            <string>Sailor&apos;s Delight</string>
+        </array>
+        <array>
+            <real>0.53819423913955688</real>
+            <string>Coastal Afternoon</string>
+        </array>
+        <array>
+            <real>0.63194417953491211</real>
+            <string>Pirate</string>
+        </array>
+        <array>
+            <real>0.7048608660697937</real>
+            <string>Desert Sunset</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Coastal Sunset</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Blizzard</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
index 001ab83fc3..302af5a9ba 100644
--- a/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
+++ b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
@@ -1,72 +1,72 @@
-<llsd>
-    <array>
-        <array>
-            <real>0</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.062499973922967911</real>
-            <string>A-12AM</string>
-        </array>
-        <array>
-            <real>0.12499994784593582</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.18749992549419403</real>
-            <string>A-3AM</string>
-        </array>
-        <array>
-            <real>0.24999989569187164</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.31249985098838806</real>
-            <string>A-6AM</string>
-        </array>
-        <array>
-            <real>0.37499985098838806</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.43749979138374329</real>
-            <string>A-9AM</string>
-        </array>
-        <array>
-            <real>0.49999979138374329</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.5624997615814209</real>
-            <string>A-12PM</string>
-        </array>
-        <array>
-            <real>0.62499970197677612</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.68749970197677612</real>
-            <string>A-3PM</string>
-        </array>
-        <array>
-            <real>0.74999970197677612</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.81249970197677612</real>
-            <string>A-6PM</string>
-        </array>
-        <array>
-            <real>0.87499958276748657</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.93749958276748657</real>
-            <string>A-9PM</string>
-        </array>
-        <array>
-            <real>0.99999958276748657</real>
-            <string>Sheer Surreality</string>
-        </array>
-    </array>
-</llsd>
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.062499973922967911</real>
+            <string>A-12AM</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.18749992549419403</real>
+            <string>A-3AM</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.31249985098838806</real>
+            <string>A-6AM</string>
+        </array>
+        <array>
+            <real>0.37499985098838806</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.43749979138374329</real>
+            <string>A-9AM</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.5624997615814209</real>
+            <string>A-12PM</string>
+        </array>
+        <array>
+            <real>0.62499970197677612</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.68749970197677612</real>
+            <string>A-3PM</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.81249970197677612</real>
+            <string>A-6PM</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.93749958276748657</real>
+            <string>A-9PM</string>
+        </array>
+        <array>
+            <real>0.99999958276748657</real>
+            <string>Sheer Surreality</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Tropicalia.xml b/indra/newview/app_settings/windlight/days/Tropicalia.xml
index b04d20c6ec..89a56d4a13 100644
--- a/indra/newview/app_settings/windlight/days/Tropicalia.xml
+++ b/indra/newview/app_settings/windlight/days/Tropicalia.xml
@@ -1,32 +1,32 @@
-<llsd>
-    <array>
-        <array>
-            <real>0.062499973922967911</real>
-            <string>Purple</string>
-        </array>
-        <array>
-            <real>0.16666659712791443</real>
-            <string>Funky Funky</string>
-        </array>
-        <array>
-            <real>0.31249985098838806</real>
-            <string>Sunrise</string>
-        </array>
-        <array>
-            <real>0.49999979138374329</real>
-            <string>Fine Day</string>
-        </array>
-        <array>
-            <real>0.66666638851165771</real>
-            <string>Desert Sunset</string>
-        </array>
-        <array>
-            <real>0.74999970197677612</real>
-            <string>Sailor&apos;s Delight</string>
-        </array>
-        <array>
-            <real>0.95833295583724976</real>
-            <string>Midnight</string>
-        </array>
-    </array>
-</llsd>
+<llsd>
+    <array>
+        <array>
+            <real>0.062499973922967911</real>
+            <string>Purple</string>
+        </array>
+        <array>
+            <real>0.16666659712791443</real>
+            <string>Funky Funky</string>
+        </array>
+        <array>
+            <real>0.31249985098838806</real>
+            <string>Sunrise</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Fine Day</string>
+        </array>
+        <array>
+            <real>0.66666638851165771</real>
+            <string>Desert Sunset</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Sailor&apos;s Delight</string>
+        </array>
+        <array>
+            <real>0.95833295583724976</real>
+            <string>Midnight</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Weird-O.xml b/indra/newview/app_settings/windlight/days/Weird-O.xml
index 51ba41ae02..1e312f2464 100644
--- a/indra/newview/app_settings/windlight/days/Weird-O.xml
+++ b/indra/newview/app_settings/windlight/days/Weird-O.xml
@@ -1,56 +1,56 @@
-<llsd>
-    <array>
-        <array>
-            <real>0</real>
-            <string>Funky Funky</string>
-        </array>
-        <array>
-            <real>0.13194438815116882</real>
-            <string>Funky Funky Funky</string>
-        </array>
-        <array>
-            <real>0.26041656732559204</real>
-            <string>Gelatto</string>
-        </array>
-        <array>
-            <real>0.40624985098838806</real>
-            <string>Funky Funky Funky</string>
-        </array>
-        <array>
-            <real>0.43749979138374329</real>
-            <string>Ghost</string>
-        </array>
-        <array>
-            <real>0.46874979138374329</real>
-            <string>Gelatto</string>
-        </array>
-        <array>
-            <real>0.5486108660697937</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.6076386570930481</real>
-            <string>Gelatto</string>
-        </array>
-        <array>
-            <real>0.68055528402328491</real>
-            <string>Ghost</string>
-        </array>
-        <array>
-            <real>0.75694411993026733</real>
-            <string>Sheer Surreality</string>
-        </array>
-        <array>
-            <real>0.87847185134887695</real>
-            <string>Gelatto</string>
-        </array>
-        <array>
-            <real>0.91319411993026733</real>
-            <string>Funky Funky Funky</string>
-        </array>
-        <array>
-            <real>0.96527737379074097</real>
-            <string>Funky Funky Funky</string>
-        </array>
-    </array>
-</llsd>
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Funky Funky</string>
+        </array>
+        <array>
+            <real>0.13194438815116882</real>
+            <string>Funky Funky Funky</string>
+        </array>
+        <array>
+            <real>0.26041656732559204</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.40624985098838806</real>
+            <string>Funky Funky Funky</string>
+        </array>
+        <array>
+            <real>0.43749979138374329</real>
+            <string>Ghost</string>
+        </array>
+        <array>
+            <real>0.46874979138374329</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.5486108660697937</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.6076386570930481</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.68055528402328491</real>
+            <string>Ghost</string>
+        </array>
+        <array>
+            <real>0.75694411993026733</real>
+            <string>Sheer Surreality</string>
+        </array>
+        <array>
+            <real>0.87847185134887695</real>
+            <string>Gelatto</string>
+        </array>
+        <array>
+            <real>0.91319411993026733</real>
+            <string>Funky Funky Funky</string>
+        </array>
+        <array>
+            <real>0.96527737379074097</real>
+            <string>Funky Funky Funky</string>
+        </array>
+    </array>
+</llsd>
-- 
cgit v1.2.3


From 50393788693578a2fe3a934faa04b382d75f1657 Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Thu, 9 Jun 2011 13:46:19 -0700
Subject: ER-910: Parcel Privacy.  Rename things in code to reflect feature
 name change to "hidden avatars"

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 6426d5c2a8..4e8f90d901 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -498,7 +498,7 @@ PARCEL_DETAILS_OWNER	Used with llGetParcelDetails to get the parcel owner id.
 PARCEL_DETAILS_GROUP	Used with llGetParcelDetails to get the parcel group id.
 PARCEL_DETAILS_AREA		Used with llGetParcelDetails to get the parcel area in square meters.
 PARCEL_DETAILS_ID		Used with llGetParcelDetails to get the parcel id.
-PARCEL_DETAILS_PRIVACY	Used with llGetParcelDetails to get the parcel privacy setting.
+PARCEL_DETAILS_HIDDEN_AVS	Used with llGetParcelDetails to get the hidden avatars setting.
 
 STRING_TRIM_HEAD		Used with llStringTrim to trim leading spaces from a string.
 STRING_TRIM_TAIL		Used with llStringTrim to trim trailing spaces from a string.
-- 
cgit v1.2.3


From 5e3d344fba6f73959d9a8caeac68984d2ae99004 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 15 Jun 2011 16:21:19 -0700
Subject: EXP-872 FIX -- Hide inbox and outbox unless applicable EXP-893 FIX --
 Single order purchases not sorted with most recent item delivered at top of
 list EXP-904 FIX -- Newness/Freshness value out of synch with new items in
 Inbox on next login when ordering in bulk with Inventory window open

* Inbox and outbox can now be forced on by setting the debug variables "InventoryDisplayInbox" and "InventoryDisplayOutbox"
* Inbox is only displayed when logging into a grid that has a marketplace that returns pup as a merchant
* Inbox contents is now a forced download when the user logs in, rather than the typical lazy load of the rest of the inventory

Reviewed by Leyla
---
 indra/newview/app_settings/settings.xml | 35 ++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 218a0534e6..bae127d217 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4180,7 +4180,29 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-	<key>InventoryLinking</key>
+    <key>InventoryDisplayInbox</key>
+    <map>
+        <key>Comment</key>
+        <string>Override received items inventory inbox display</string>
+        <key>Persist</key>
+        <integer>0</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
+    <key>InventoryDisplayOutbox</key>
+    <map>
+        <key>Comment</key>
+        <string>Override merchant inventory outbox display</string>
+        <key>Persist</key>
+        <integer>0</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
+    <key>InventoryLinking</key>
 	<map>
 		<key>Comment</key>
 		<string>Enable ability to create links to folders and items via "Paste as link".</string>
@@ -4422,6 +4444,17 @@
       <key>Value</key>
         <real>2.0</real>
     </map>
+    <key>LastInventoryInboxExpand</key>
+    <map>
+        <key>Comment</key>
+        <string>The last time the received items inbox was expanded.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <string />
+    </map>
     <key>LCDDestination</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 8a4b3e33cdd6f196f25e4acf86e80de08907590e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 29 Jun 2011 13:13:10 -0700
Subject: EXP-961 FIX Keyboard definition file keys.xml contains invalid XML
 markup

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keys.xml b/indra/newview/app_settings/keys.xml
index d085475c6c..101deea55b 100644
--- a/indra/newview/app_settings/keys.xml
+++ b/indra/newview/app_settings/keys.xml
@@ -181,7 +181,7 @@
     <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/>
   </third_person>
 
-  # Basic editing camera control
+  <-- Basic editing camera control -->
   <edit>
     <binding key="A" mask="NONE" command="spin_around_cw"/>
     <binding key="D" mask="NONE" command="spin_around_ccw"/>
-- 
cgit v1.2.3


From 2b2feaa929eda46bfeb4fe8baf2838e798ab35ac Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 29 Jun 2011 14:26:51 -0700
Subject: fixing key file comment - missing !

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keys.xml b/indra/newview/app_settings/keys.xml
index 101deea55b..6e3673e7d9 100644
--- a/indra/newview/app_settings/keys.xml
+++ b/indra/newview/app_settings/keys.xml
@@ -181,7 +181,7 @@
     <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/>
   </third_person>
 
-  <-- Basic editing camera control -->
+  <!-- Basic editing camera control -->
   <edit>
     <binding key="A" mask="NONE" command="spin_around_cw"/>
     <binding key="D" mask="NONE" command="spin_around_ccw"/>
-- 
cgit v1.2.3


From 918238dd18f74ee2783d55dfb961e8f44b2f4b1b Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Fri, 1 Jul 2011 14:06:08 -0700
Subject: ER-1016 - "Remove ability for anyone to edit terrain" and ER-910
 "Parcel Privacy" changes.  Many naming changes for the featureto be "See
 avatars" instead of "hidden avatars".  Also removed the "anyone can edit
 terrain" checkbox and slammed the value to FALSE.

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 4e8f90d901..9fa4046fdf 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -498,7 +498,7 @@ PARCEL_DETAILS_OWNER	Used with llGetParcelDetails to get the parcel owner id.
 PARCEL_DETAILS_GROUP	Used with llGetParcelDetails to get the parcel group id.
 PARCEL_DETAILS_AREA		Used with llGetParcelDetails to get the parcel area in square meters.
 PARCEL_DETAILS_ID		Used with llGetParcelDetails to get the parcel id.
-PARCEL_DETAILS_HIDDEN_AVS	Used with llGetParcelDetails to get the hidden avatars setting.
+PARCEL_DETAILS_SEE_AVATARS	Used with llGetParcelDetails to get the avatars visibility setting.
 
 STRING_TRIM_HEAD		Used with llStringTrim to trim leading spaces from a string.
 STRING_TRIM_TAIL		Used with llStringTrim to trim trailing spaces from a string.
-- 
cgit v1.2.3


From 31c1cff64fe6e963722e580c8779d69cef4b14ba Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 6 Jul 2011 00:42:28 +0300
Subject: STORM-1262 FIXED Removed the original Windlight Region Settings
 implementation.

---
 indra/newview/app_settings/settings.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index efe605e5e6..01daf1ceb2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10237,17 +10237,6 @@
       <key>Value</key>
       <real>0.300000011921</real>
     </map>
-    <key>SkyEditPresets</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether to be able to edit the sky defaults or not</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>SkyNightColorShift</key>
     <map>
       <key>Comment</key>
@@ -12543,17 +12532,6 @@
       <key>Value</key>
       <integer>20</integer>
     </map>
-    <key>WaterEditPresets</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether to be able to edit the water defaults or not</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>WaterGLFogDensityScale</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From aecfaef10c41dce7395c3a02dcd84a39b6ffbeee Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 5 Jul 2011 16:51:04 -0700
Subject: EXP-982 FIX As a user, I would like to see the new web-based profiles
 without any browser chrome and at an appropriate default size

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 34a179f95b..9d46cd442b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13405,5 +13405,20 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+     <key>WebProfileRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Web profile dimensions</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>650</integer>
+        <integer>475</integer>
+        <integer>0</integer>
+      </array>    </map>
 </map>
 </llsd>
-- 
cgit v1.2.3


From 6c63a1ae09dca557af67a06c7871bfe287765dd4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 13:26:06 -0700
Subject: tweaked web profile floater size

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9d46cd442b..255bb48f65 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13417,7 +13417,7 @@
       <array>
         <integer>0</integer>
         <integer>650</integer>
-        <integer>475</integer>
+        <integer>490</integer>
         <integer>0</integer>
       </array>    </map>
 </map>
-- 
cgit v1.2.3


From caff254c9155b55412556c9270bec4b114d83270 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 18:43:52 -0700
Subject: EXP-847 FIX As a user, I would like to see the How To floater appear
 the first time I log in to basic mode

---
 indra/newview/app_settings/settings.xml         | 25 ++++++++++++++++++++++++-
 indra/newview/app_settings/settings_minimal.xml | 13 ++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 255bb48f65..0ae4545911 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13419,6 +13419,29 @@
         <integer>650</integer>
         <integer>490</integer>
         <integer>0</integer>
-      </array>    </map>
+      </array>    
+    </map>
+   <key>HelpFloaterOpen</key>
+    <map>
+      <key>Comment</key>
+      <string>Show Help Floater on login?</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+     <key>ShowHelpOnFirstLogin</key>
+    <map>
+      <key>Comment</key>
+      <string>Show Help Floater on first login</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 70a75cb4ca..29e52ab054 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -459,5 +459,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-  </map>
+    <key>ShowHelpOnFirstLogin</key>
+    <map>
+      <key>Comment</key>
+      <string>Show Help Floater on first login</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    </map>
 </llsd>
-- 
cgit v1.2.3


From fabb46db1e3fdcdc36c23c697d0e4bdb800e7954 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 19:10:32 -0700
Subject: EXP-940 FIX Make search button on by default in advanced mode

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0ae4545911..1751f6702a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9681,7 +9681,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowSnapshotButton</key>
     <map>
-- 
cgit v1.2.3


From 674d8522a10d0067a8b4067aca9853cbce68e3c9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 7 Jul 2011 12:11:30 -0700
Subject: EXP-847 FIX As a user, I would like to see the How To floater appear
 the first time I log in to basic mode made help window not appear on login
 for advanced mode made help window visibility state properly persist in
 advanced mode

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1751f6702a..ad9b6b0c90 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13430,7 +13430,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
      <key>ShowHelpOnFirstLogin</key>
     <map>
-- 
cgit v1.2.3