diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
| commit | 44f70be1e447664ec3ee050e85a8e14965fff4e7 (patch) | |
| tree | c1a5c851a06dd77a27cbc135e4625701e743902e /indra/llaudio/llaudioengine.cpp | |
| parent | 4cfcbca748e825b4904e7f136fa625b1a0f79dfb (diff) | |
| parent | 915de3eb556c22216fd3c76e2de4a2ab1953dbe0 (diff) | |
Merged DRTVWR-544-maint into SL-12238
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index e0ebbb76bd..2a00fe7c5a 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -827,7 +827,8 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i addAudioSource(asp); if (pos_global.isExactlyZero()) { - asp->setAmbient(true); + // For sound preview and UI + asp->setForcedPriority(true); } else { @@ -1273,7 +1274,7 @@ LLAudioSource::LLAudioSource(const LLUUID& id, const LLUUID& owner_id, const F32 mPriority(0.f), mGain(gain), mSourceMuted(false), - mAmbient(false), + mForcedPriority(false), mLoop(false), mSyncMaster(false), mSyncSlave(false), @@ -1339,7 +1340,7 @@ void LLAudioSource::update() void LLAudioSource::updatePriority() { - if (isAmbient()) + if (isForcedPriority()) { mPriority = 1.f; } |