diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 20:22:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 20:22:45 +0300 |
| commit | 4c54488470a37f53f46c9d4694644a10b92b9790 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/newview/llmachineid.cpp | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff) | |
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A merge
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: -------------------------------------------------- |