livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Richard Linden 2010-05-25 10:15:09 -07:00
parent a781dd767c e98a52a211
commit 1040c7039b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/settings.xml
View File

@ -5971,7 +5971,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.2</real>
<real>0.125</real>
</map>
<key>MediaRollOffMin</key>
<map>
@ -5982,7 +5982,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>7.0</real>
<real>5.0</real>
</map>
<key>MediaRollOffMax</key>
<map>

2
indra/newview/llviewermedia.cpp
View File

@ -1937,7 +1937,7 @@ void LLViewerMediaImpl::updateVolume()
// attenuated_volume = 1 / (roll_off_rate * (d - min))^2
// the +1 is there so that for distance 0 the volume stays the same
F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffMin");
F64 attenuation = gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance;
F64 attenuation = 1.0 + (gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance);
attenuation = 1.0 / (attenuation * attenuation);
// the attenuation multiplier should never be more than one since that would increase volume
volume = volume * llmin(1.0, attenuation);