summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-29 11:32:42 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-29 11:32:42 +0100
commitfee6f311d310dccfa3ae5f28a9911a2d5b7e7d62 (patch)
treeb8ba490183411702dca18cde30ad6e70dff2a2d5 /indra/newview/app_settings
parent8413842ff763f0a6b8a8d7e5ff51989e42a4d148 (diff)
parenta0527cb6f728a2814fdf8b0fa6f149c7041efcac (diff)
merge from viewer-trunk
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 a820d82f6f..4c0d47ced3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5849,7 +5849,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>