diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-09-15 20:44:04 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-09-15 20:44:04 +0300 |
| commit | 329268c5f7520a288e76e253f9bffea9dc212488 (patch) | |
| tree | dffda1aca4433b5acd7cd759714b03a6e85feb67 /indra/llaudio/llaudioengine.h | |
| parent | c50dd63ca38ce44f6c6997a052a114989db8c942 (diff) | |
| parent | c2a27c474dc11dff4f93b0bd319cfec7de27bb22 (diff) | |
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
Diffstat (limited to 'indra/llaudio/llaudioengine.h')
| -rwxr-xr-x | indra/llaudio/llaudioengine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 65356ba00e..0fe8b3d756 100755 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -265,8 +265,8 @@ public: void addAudioData(LLAudioData *adp, bool set_current = TRUE); - void setAmbient(const bool ambient) { mAmbient = ambient; } - bool isAmbient() const { return mAmbient; } + void setForcedPriority(const bool ambient) { mForcedPriority = ambient; } + bool isForcedPriority() const { return mForcedPriority; } void setLoop(const bool loop) { mLoop = loop; } bool isLoop() const { return mLoop; } @@ -325,7 +325,7 @@ protected: F32 mPriority; F32 mGain; bool mSourceMuted; - bool mAmbient; + bool mForcedPriority; // ignore mute, set high priority, researved for sound preview and UI bool mLoop; bool mSyncMaster; bool mSyncSlave; |