diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-06 15:38:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-06 15:38:35 -0500 |
| commit | 573ca63e0f837fd52cbfc8adc3546d8971d21b12 (patch) | |
| tree | 993ce3f4616c3ec2ded79379802e2f5baccbcff5 /indra | |
| parent | 86774bb53f2417eb3d6e8882f5e1b6ea1b5c7376 (diff) | |
| parent | d8fbfb4e1a3cfa661d07dd62aaf171ef5ca51e04 (diff) | |
Merge pull request #3684 from secondlife/andreyk/viewer_3569
#3569 Pull in some fixes from forevermac
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 4 | ||||
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index 18d682b554..755547bfaa 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -79,7 +79,7 @@ bool LLAudioEngine_OpenAL::init(void* userdata, const std::string &app_title) ALCdevice *device = alcGetContextsDevice(alcGetCurrentContext()); alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &major); - alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &minor); + alcGetIntegerv(device, ALC_MINOR_VERSION, 1, &minor); LL_INFOS() << "ALC version: " << major << "." << minor << LL_ENDL; LL_INFOS() << "ALC default device: " @@ -190,6 +190,8 @@ LLAudioChannelOpenAL::~LLAudioChannelOpenAL() void LLAudioChannelOpenAL::cleanup() { alSourceStop(mALSource); + alSourcei(mALSource, AL_BUFFER, AL_NONE); + mCurrentBufferp = NULL; } diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 908f3c8ff5..19a0ce639a 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -400,9 +400,14 @@ void LLPluginProcessParent::idle(void) apr_sockaddr_t* addr = NULL; mListenSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP); mBoundPort = 0; + if (!mListenSocket) + { + killSockets(); + errorState(); + break; + } // This code is based on parts of LLSocket::create() in lliosocket.cpp. - status = apr_sockaddr_info_get( &addr, "127.0.0.1", |