diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-01 06:47:55 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-01 06:47:55 +0100 |
| commit | f92d7f282954d5f4601178603aa715ae74287957 (patch) | |
| tree | 85c7018fac0dc3151ff9e22c3e6248468781ebe1 /indra/newview/app_settings | |
| parent | b0fa1e011f14356b3634f39d32f43e244b6f1298 (diff) | |
| parent | 1b827077717483d59d1d16ec4203ae9fb8199c8f (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c5602d1bcc..98aa860b41 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5862,7 +5862,7 @@ <key>Value</key> <real>1.0</real> </map> - <key>MediaRollOffFactor</key> + <key>MediaRollOffRate</key> <map> <key>Comment</key> <string>Multiplier to change rate of media attenuation</string> @@ -5871,7 +5871,29 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>10.0</real> + <real>0.2</real> + </map> + <key>MediaRollOffMin</key> + <map> + <key>Comment</key> + <string>Adjusts the distance at which media attentuation starts</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>7.0</real> + </map> + <key>MediaRollOffMax</key> + <map> + <key>Comment</key> + <string>Distance at which media volume is set to 0</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>30.0</real> </map> <key>RecentItemsSortOrder</key> <map> |