diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-05 13:37:59 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-05 13:37:59 +0300 |
commit | c4070bd67266f9dffd333221ef2ff41a88523169 (patch) | |
tree | fad3c215a07bb60e29ef99adb48851e057a9a3a1 /indra/newview/app_settings | |
parent | 35fc01e3f52c2d5338e3a7556cc998707a418f16 (diff) | |
parent | 402c4cc9032b17df63c2a1a0395815eff9b9f906 (diff) |
Merge from default branch
--HG--
branch : product-engine
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 73eb269f66..d689822e4e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5851,7 +5851,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> @@ -5860,7 +5860,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> |