diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-01-02 23:04:02 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-01-02 23:04:42 +0100 |
| commit | 6850b915fe42f5a75fc9d8bb9ca05f961de3244a (patch) | |
| tree | 0921b5e0c74a64ad65d1b5702b00142badb6140c /indra/llaudio/llaudioengine_openal.cpp | |
| parent | 89456ec88df01565e2c9a424a0097a5a02e1838c (diff) | |
| parent | f3f3c493ec2a658cf5c1aac6670c54c550e944fd (diff) | |
Merge branch 'master' into texture-preview
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index 3bdd0302ee..0a79614424 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -52,10 +52,10 @@ LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL() } // virtual -bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata, const std::string &app_title) +bool LLAudioEngine_OpenAL::init(void* userdata, const std::string &app_title) { mWindGen = NULL; - LLAudioEngine::init(num_channels, userdata, app_title); + LLAudioEngine::init(userdata, app_title); if(!alutInit(NULL, NULL)) { @@ -297,7 +297,7 @@ void LLAudioChannelOpenAL::update3DPosition() { return; } - if (mCurrentSourcep->isAmbient()) + if (mCurrentSourcep->isForcedPriority()) { alSource3f(mALSource, AL_POSITION, 0.0, 0.0, 0.0); alSource3f(mALSource, AL_VELOCITY, 0.0, 0.0, 0.0); |