From b165492945d4a9b13a594ec626e49482da9635b1 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 28 Dec 2009 13:19:15 +0200
Subject: Fixed normal bug EXT-2791 - Upload Image / sound / animation missing
 cost.

--HG--
branch : product-engine
---
 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 ba78d80ad1..bf69986094 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2344,6 +2344,17 @@
       <key>Value</key>
       <string>89556747-24cb-43ed-920b-47caed15465f</string>
     </map>
+    <key>DefaultUploadCost</key>
+    <map>
+      <key>Comment</key>
+      <string>Default sound/image/file upload cost(in case economy data is not available).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>10</integer>
+    </map>
     <key>DisableCameraConstraints</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 904de223b6da701e2512b8d8bf0d3be478421c78 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Tue, 29 Dec 2009 18:18:52 -0700
Subject: for DEV-44376: create a switch for texture decoding.

---
 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 ba78d80ad1..7296c5d947 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8727,6 +8727,17 @@
       <key>Value</key>
       <real>20.0</real>
     </map>
+    <key>TextureDecodeDisabled</key>
+    <map>
+      <key>Comment</key>
+      <string>If TRUE, do not fetch and decode any textures</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>TextureDisable</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 4e901957f9414284fa26ca70122f952243e4122c Mon Sep 17 00:00:00 2001
From: James Cook <james@cookmd.com>
Date: Wed, 30 Dec 2009 15:46:53 -0800
Subject: EXT-3753 Made inventory subfolders indent more. Changed back to 8
 pixel indent, as Ben Glenn was seeing confusion in user tests with lesser
 indents.  Made it a setting, FolderIndentation in case we want to change in
 the future. Reviewed with Leyla.

---
 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 0ee39c2fc8..55db13e44a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3235,6 +3235,17 @@
       <key>Value</key>
       <real>0.75</real>
     </map>
+    <key>FolderIndentation</key>
+    <map>
+      <key>Comment</key>
+      <string>Number of pixels to indent subfolders in inventory</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>8</integer>
+    </map>
     <key>FolderLoadingMessageWaitTime</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 8dec87c2ecbf2fe3d3c48d83722d5ee0acc8f53f Mon Sep 17 00:00:00 2001
From: James Cook <james@cookmd.com>
Date: Wed, 30 Dec 2009 16:47:25 -0800
Subject: EXT-1399 Restore some wind noise when standing still, but drop volume
 Make wind volume configurable via setting AudioLevelWind, currently set to
 0.5.  Changing this to 1.0 will restore the viewer 1.23 behavior Reviewed
 with Leyla.

---
 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 55db13e44a..e24e1a8605 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -264,6 +264,17 @@
       <string>F32</string>
       <key>Value</key>
       <real>0.5</real>
+    </map>
+    <key>AudioLevelWind</key>
+    <map>
+      <key>Comment</key>
+      <string>Audio level of wind noise when standing still</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.5</real>
     </map>
 	<key>AudioSteamingMedia</key>
     <map>
-- 
cgit v1.2.3