diff options
| author | Roxanne Skelly <roxanne@roxiware.com> | 2024-05-08 17:41:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-08 17:41:46 -0700 |
| commit | be19e495c5483c06b9b90dd18bf8ebbe7ceaa336 (patch) | |
| tree | 4d51dd366e2e2ce69610a06e7ab767824ab8869c /indra/newview/llmachineid.cpp | |
| parent | 818c8c6deaa755c02b64fb03766ee03d66021968 (diff) | |
| parent | 70af754dc09e29a492828e7cc4ed5db8d32eda3d (diff) | |
Merge pull request #1440 from secondlife/roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llmachineid.cpp')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index 583742f970..1f4418f119 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -85,11 +85,11 @@ void LLWMIMethods::initCOMObjects() // Step 1: -------------------------------------------------- // Initialize COM. ------------------------------------------ - mHR = CoInitializeEx(0, COINIT_MULTITHREADED); + mHR = CoInitializeEx(0, COINIT_APARTMENTTHREADED); if (FAILED(mHR)) { + // if result S_FALSE, it's already initialized LL_DEBUGS("AppInit") << "Failed to initialize COM library. Error code = 0x" << std::hex << mHR << LL_ENDL; - return; } // Step 2: -------------------------------------------------- |