diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 21:53:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 21:53:31 +0200 |
| commit | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (patch) | |
| tree | 757f3a3446e8f55e1cc073f1b3ab54d8e5af1b65 /indra/newview/llmachineid.cpp | |
| parent | edb2fb57f8782f966c7ea675d2e4c0135352ef02 (diff) | |
| parent | 2a849259223a2d3fabafc118d711e73fa7fd604f (diff) | |
Merge pull request #734 from secondlife/DRTVWR-594-maint-Y
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: -------------------------------------------------- |