summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-29 15:24:09 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-29 15:24:09 +0300
commit7d0769f3e1979d12b8cf55e0f5312fecade49bee (patch)
treebc35fbf959a358315358722943a4bfd7b213850c /indra/newview/app_settings
parent4eb741883cbee15e28272677bcb9b58dce85ee42 (diff)
parent8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a6dbe00759..6f11a6d616 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5838,7 +5838,18 @@
<key>Value</key>
<real>1.0</real>
</map>
- <key>RecentItemsSortOrder</key>
+ <key>MediaRollOffFactor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multiplier to change rate of media attenuation</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>10.0</real>
+ </map>
+ <key>RecentItemsSortOrder</key>
<map>
<key>Comment</key>
<string>Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>