From 7d4b1c014c9900af47005a529df50ece14249326 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 22 Jul 2020 14:41:19 +0300 Subject: SL-13082 Declare macOS SDK version to be 10.12 instead of 10.15 --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 7bbbf6430a..fb6340f026 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1462,6 +1462,7 @@ Tonya Souther BUG-3875 BUG-3968 OPEN-345 + SL-13082 Torben Trautman TouchaHoney Perhaps TraductoresAnonimos Alter -- cgit v1.3 From 77c629e0251cf5b5a65077ec6a0697555f7be70a Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 6 Aug 2020 15:23:12 +0300 Subject: Revert "SL-13082 Declare macOS SDK version to be 10.12 instead of 10.15" This reverts commit 7d4b1c014c9900af47005a529df50ece14249326. Until the TC mac build nodes update. --- doc/contributions.txt | 1 - indra/newview/CMakeLists.txt | 4 ---- indra/newview/Info-SecondLife.plist | 2 -- 3 files changed, 7 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index fb6340f026..7bbbf6430a 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1462,7 +1462,6 @@ Tonya Souther BUG-3875 BUG-3968 OPEN-345 - SL-13082 Torben Trautman TouchaHoney Perhaps TraductoresAnonimos Alter diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a17bf088cd..0d204fd716 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1944,10 +1944,6 @@ elseif (DARWIN) set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP" - # Force the SDK version in the linked executable to be 10.12. This will fool - # macOS into using the pre-Mojave display system, avoiding the blurry display that - # otherwise occurs when upscaling the viewer to Retina resolution levels. - LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -platform_version -Xlinker macos -Xlinker ${CMAKE_OSX_DEPLOYMENT_TARGET} -Xlinker 10.12" ) else (WINDOWS) # Linux diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 4f09495f83..cfe9d991c5 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -79,7 +79,5 @@ ${MACOSX_BUNDLE_NSPRINCIPAL_CLASS} NSMainNibFile ${MACOSX_BUNDLE_NSMAIN_NIB_FILE} - NSHighResolutionCapable - -- cgit v1.3 From a059e0d2e5f515376abc0a8a0d2c6ad32e3b2639 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 22 Jan 2021 22:59:26 +0200 Subject: SL-3136 Logout crash fixes from Ansariel Hiller --- doc/contributions.txt | 1 + indra/newview/llattachmentsmgr.cpp | 1 + indra/newview/llvoiceclient.cpp | 6 ++++++ 3 files changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index bbdfaf655d..c5d58cec9b 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -226,6 +226,7 @@ Ansariel Hiller SL-13364 SL-13858 SL-13697 + SL-3136 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp index d3e66289d1..0fd6009074 100644 --- a/indra/newview/llattachmentsmgr.cpp +++ b/indra/newview/llattachmentsmgr.cpp @@ -248,6 +248,7 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments() { if (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(*it) && + !gAgentAvatarp->getWornAttachment(*it)->isTempAttachment() && // Don't link temp attachments in COF! !LLAppearanceMgr::instance().isLinkedInCOF(*it)) { LLUUID item_id = *it; diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 6991ca6698..06e20038c5 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -181,6 +181,12 @@ void LLVoiceClient::terminate() if (mVoiceModule) mVoiceModule->terminate(); mVoiceModule = NULL; m_servicePump = NULL; + + // Shutdown speaker volume storage before LLSingletonBase::deleteAll() does it + if (LLSpeakerVolumeStorage::instanceExists()) + { + LLSpeakerVolumeStorage::deleteSingleton(); + } } const LLVoiceVersionInfo LLVoiceClient::getVersion() -- cgit v1.3 From a3d31ca683eb0744563b36d6432168fde6ae77d9 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 26 Jan 2021 20:28:31 +0200 Subject: SL-14766 long unicode display names corrupt the conversation.log Contribution by Beq Janus --- doc/contributions.txt | 4 ++-- indra/newview/llconversationlog.cpp | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index c5d58cec9b..9340d69b97 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -264,10 +264,10 @@ Benja Kepler Benjamin Bigdipper Beq Janus BUG-227094 -Beth Walcher -Beq Janus SL-10288 SL-13583 + SL-14766 +Beth Walcher Bezilon Kasei Biancaluce Robbiani CT-225 diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 9d78c528b6..fd59dd2601 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -535,7 +535,9 @@ bool LLConversationLog::loadFromFile(const std::string& filename) } bool purge_required = false; - char buffer[MAX_STRING]; + static constexpr int UTF_BUFFER{ 1024 }; // long enough to handle the most extreme Unicode nonsense and some to spare + + char buffer[UTF_BUFFER]; char conv_name_buffer[MAX_STRING]; char part_id_buffer[MAX_STRING]; char conv_id_buffer[MAX_STRING]; @@ -546,11 +548,14 @@ bool LLConversationLog::loadFromFile(const std::string& filename) // before CHUI-348 it was a flag of conversation voice state int prereserved_unused; - while (!feof(fp) && fgets(buffer, MAX_STRING, fp)) + memset(buffer, '\0', UTF_BUFFER); + while (!feof(fp) && fgets(buffer, UTF_BUFFER, fp)) { - conv_name_buffer[0] = '\0'; - part_id_buffer[0] = '\0'; - conv_id_buffer[0] = '\0'; + // force blank for added safety + memset(conv_name_buffer, '\0', MAX_STRING); + memset(part_id_buffer, '\0', MAX_STRING); + memset(conv_id_buffer, '\0', MAX_STRING); + memset(history_file_name, '\0', MAX_STRING); sscanf(buffer, "[%lld] %d %d %d %[^|]| %s %s %[^|]|", &time, @@ -587,6 +592,7 @@ bool LLConversationLog::loadFromFile(const std::string& filename) } mConversations.push_back(conversation); + memset(buffer, '\0', UTF_BUFFER); } fclose(fp); -- cgit v1.3