summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-01-14 10:28:29 -0800
committerMerov Linden <merov@lindenlab.com>2011-01-14 10:28:29 -0800
commit7314ad41be6142463123e8523c8b97b38400dd9b (patch)
tree95034dfa3d3b96fc9a3571d1cd4e810ab81d3ac0
parent939e8d8f74687e7cb857c55bb6a8082226f1202b (diff)
parentd67f04da83c11707f2c4214b94c24d9cd12a16b6 (diff)
STORM-830 : pull into viewer-development
-rw-r--r--indra/llaudio/llaudioengine.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index c9cb1cd6e7..5e540ad8c5 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -97,7 +97,11 @@ void LLAudioEngine::setDefaults()
}
mMasterGain = 1.f;
- mInternalGain = 0.f;
+ // Setting mInternalGain to an out of range value fixes the issue reported in STORM-830.
+ // There is an edge case in setMasterGain during startup which prevents setInternalGain from
+ // being called if the master volume setting and mInternalGain both equal 0, so using -1 forces
+ // the if statement in setMasterGain to execute when the viewer starts up.
+ mInternalGain = -1.f;
mNextWindUpdate = 0.f;
mStreamingAudioImpl = NULL;