diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-12-06 12:58:20 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-12-06 12:59:21 +0200 |
| commit | 5accc1feff322c89e63fbfa0f3ac6911abcf6436 (patch) | |
| tree | ef69fcb90aa62cb8a889a8b7c86af5e3360e4c89 /indra/newview | |
| parent | 4fc7bc0703df40566c4c33f8406d1301079a3ff8 (diff) | |
SL-20695 Fix hardware probes
CoCreateInstance returns 'no interface supported'
Preferable not to mix init types so switched everything.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index 8f03b13d2d..1f4418f119 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -85,12 +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: -------------------------------------------------- |