From 5478f2a223b5b679fe4515aa5a88f9ae1ed36985 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 11 Jul 2017 14:54:29 +0300 Subject: MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 549adaaef7..064639fe72 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -823,6 +823,7 @@ Kitty Barnett MAINT-6154 MAINT-6568 STORM-2149 + MAINT-7581 Kolor Fall Komiko Okamoto Korvel Noh -- cgit v1.3 From 530f69ff33a6b3854c489590eddb0ba7d6bd7264 Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Mon, 10 Jul 2017 17:22:12 +0300 Subject: MAINT-7541 Not able to save login credentials on clean install --- doc/contributions.txt | 1 + indra/newview/llmachineid.cpp | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 064639fe72..b5d4e181bf 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1041,6 +1041,7 @@ Nicholaz Beresford Nick Rhodes NickyD MAINT-873 + MAINT-7541 Nicky Dasmijn VWR-29228 MAINT-1392 diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index b5fd3df0f3..b0ee8e7fcb 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -37,6 +37,28 @@ using namespace std; unsigned char static_unique_id[] = {0,0,0,0,0,0}; bool static has_static_unique_id = false; +#if LL_WINDOWS + +class LLComInitialize +{ + HRESULT mHR; +public: + LLComInitialize() + { + mHR = CoInitializeEx(0, COINIT_MULTITHREADED); + if (FAILED(mHR)) + LL_DEBUGS("AppInit") << "Failed to initialize COM library. Error code = 0x" << hex << mHR << LL_ENDL; + } + + ~LLComInitialize() + { + if (SUCCEEDED(mHR)) + CoUninitialize(); + } +}; + +#endif //LL_WINDOWS + // get an unique machine id. // NOT THREAD SAFE - do before setting up threads. // MAC Address doesn't work for Windows 7 since the first returned hardware MAC address changes with each reboot, Go figure?? @@ -59,12 +81,7 @@ S32 LLMachineID::init() // Step 1: -------------------------------------------------- // Initialize COM. ------------------------------------------ - hres = CoInitializeEx(0, COINIT_MULTITHREADED); - if (FAILED(hres)) - { - LL_DEBUGS("AppInit") << "Failed to initialize COM library. Error code = 0x" << hex << hres << LL_ENDL; - return 1; // Program has failed. - } + LLComInitialize comInit; // Step 2: -------------------------------------------------- // Set general COM security levels -------------------------- @@ -89,7 +106,6 @@ S32 LLMachineID::init() if (FAILED(hres)) { LL_WARNS("AppInit") << "Failed to initialize security. Error code = 0x" << hex << hres << LL_ENDL; - CoUninitialize(); return 1; // Program has failed. } @@ -107,7 +123,6 @@ S32 LLMachineID::init() if (FAILED(hres)) { LL_WARNS("AppInit") << "Failed to create IWbemLocator object." << " Err code = 0x" << hex << hres << LL_ENDL; - CoUninitialize(); return 1; // Program has failed. } @@ -134,7 +149,6 @@ S32 LLMachineID::init() { LL_WARNS("AppInit") << "Could not connect. Error code = 0x" << hex << hres << LL_ENDL; pLoc->Release(); - CoUninitialize(); return 1; // Program has failed. } @@ -160,7 +174,6 @@ S32 LLMachineID::init() LL_WARNS("AppInit") << "Could not set proxy blanket. Error code = 0x" << hex << hres << LL_ENDL; pSvc->Release(); pLoc->Release(); - CoUninitialize(); return 1; // Program has failed. } @@ -181,7 +194,6 @@ S32 LLMachineID::init() LL_WARNS("AppInit") << "Query for operating system name failed." << " Error code = 0x" << hex << hres << LL_ENDL; pSvc->Release(); pLoc->Release(); - CoUninitialize(); return 1; // Program has failed. } @@ -236,7 +248,6 @@ S32 LLMachineID::init() pLoc->Release(); if (pEnumerator) pEnumerator->Release(); - CoUninitialize(); ret_code=0; #else unsigned char * staticPtr = (unsigned char *)(&static_unique_id[0]); -- cgit v1.3 From f7186ac2604cf01b0f9666a8cb510aa91169e3a0 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Tue, 11 Jul 2017 20:46:53 +0300 Subject: Contributors list fix: NickyD and Nicky Dasmijn are the same person --- doc/contributions.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index b5d4e181bf..6f4e88e836 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1039,10 +1039,9 @@ Nicholaz Beresford VWR-2682 VWR-2684 Nick Rhodes -NickyD +Nicky Dasmijn MAINT-873 MAINT-7541 -Nicky Dasmijn VWR-29228 MAINT-1392 MAINT-873 -- cgit v1.3