diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-04-29 02:38:39 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-29 02:38:39 +0100 |
commit | b90ece0936149a69b1176adc4ae2508c61e34fd7 (patch) | |
tree | 4295b0d766fd6cc80afccac4b689134741b5bb0e /indra/newview/app_settings | |
parent | 46897efc3efade25feaaa1dc67bc131c35202d12 (diff) | |
parent | 8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff) |
Merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e763f9cebc..45de05ae82 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> |