From 73ca604ad5aa5dc93198ab8778b135b7f01d5c7b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 14 Nov 2022 22:39:03 +0200 Subject: [PATCH 1/4] SL-18618 Update libpng --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 1a353fe2e9..f363b76706 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1418,9 +1418,9 @@ archive hash - c1c9e32e21f3c34d91ed045b2ca91f24 + 7a0059748d0b8733f2f9ce434cf604b8 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87781/805801/libpng-1.6.8.563850-darwin64-563850.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107514/937867/libpng-1.6.38.576621-darwin64-576621.tar.bz2 name darwin64 @@ -1442,9 +1442,9 @@ archive hash - 642e9cf95c8ccd0eb34f6d7a40df585a + 3112013186ad60b0fc270a398d4dd499 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87782/805831/libpng-1.6.8.563850-windows-563850.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107513/937823/libpng-1.6.38.576621-windows-576621.tar.bz2 name windows @@ -1454,16 +1454,16 @@ archive hash - ce46aa0f171d97626c4a3940347cecd7 + 7c6bfcdb0d6162587cdbc436f595dd02 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87780/805832/libpng-1.6.8.563850-windows64-563850.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107512/937822/libpng-1.6.38.576621-windows64-576621.tar.bz2 name windows64 version - 1.6.8.563850 + 1.6.38.576621 libuuid From 5f44c2a5ffacc04e383635840f50ad3ddcf69dd4 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 17 Nov 2022 00:41:35 +0200 Subject: [PATCH 2/4] SL-15869 Do not account for login menu when checking if key combination is avaliable Ex: Allow mapping actions to Ctrl+Alt+D --- indra/newview/llkeyconflict.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp index d3ba18525b..60f8aca94c 100644 --- a/indra/newview/llkeyconflict.cpp +++ b/indra/newview/llkeyconflict.cpp @@ -171,8 +171,9 @@ bool LLKeyConflictHandler::isReservedByMenu(const KEY &key, const MASK &mask) { return false; } - return (gMenuBarView && gMenuBarView->hasAccelerator(key, mask)) - || (gLoginMenuBarView && gLoginMenuBarView->hasAccelerator(key, mask)); + // At the moment controls are only applicable inworld, + // ignore gLoginMenuBarView + return gMenuBarView && gMenuBarView->hasAccelerator(key, mask); } // static @@ -182,8 +183,7 @@ bool LLKeyConflictHandler::isReservedByMenu(const LLKeyData &data) { return false; } - return (gMenuBarView && gMenuBarView->hasAccelerator(data.mKey, data.mMask)) - || (gLoginMenuBarView && gLoginMenuBarView->hasAccelerator(data.mKey, data.mMask)); + return gMenuBarView && gMenuBarView->hasAccelerator(data.mKey, data.mMask); } bool LLKeyConflictHandler::registerControl(const std::string &control_name, U32 index, EMouseClickType mouse, KEY key, MASK mask, bool ignore_mask) From a8ded3bcc4703803f738df14a665016aa20d03a2 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 18 Nov 2022 14:43:54 +0200 Subject: [PATCH 3/4] SL-17135 Pull in apr-suit package Same apr suit version, but with debug symbols --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f363b76706..ae63d08f93 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -52,9 +52,9 @@ archive hash - b6357ef3a0ec37877a5831820f25094e + 178b16ee9ff67986c8c14413ee68218e url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80557/759704/apr_suite-1.4.5.558565-darwin64-558565.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107593/938535/apr_suite-1.4.5.576669-darwin64-576669.tar.bz2 name darwin64 @@ -76,9 +76,9 @@ archive hash - cb48ac069440f6dcd564cfa9fd02a4c2 + d2997cad03dbd0d70a060276b5671480 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80556/759710/apr_suite-1.4.5.558565-windows-558565.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107594/938548/apr_suite-1.4.5.576669-windows-576669.tar.bz2 name windows @@ -88,16 +88,16 @@ archive hash - 646dc3828d9c39fb1e77c4eec44ed739 + ec24f5945faa8f13807b83eeaeb994f8 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80555/759709/apr_suite-1.4.5.558565-windows64-558565.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107592/938547/apr_suite-1.4.5.576669-windows64-576669.tar.bz2 name windows64 version - 1.4.5.558565 + 1.4.5.576669 boost From e231b6d8d3bf3d65d94054e6259e5d33d24e5425 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 22 Nov 2022 01:43:14 +0200 Subject: [PATCH 4/4] SL-18689 Crash at LLTabContainer::selectNextTab() FPE_NOOP at "idx = (idx + 1 ) % (S32)mTabList.size();" --- indra/llui/lltabcontainer.cpp | 5 +++++ indra/newview/llstartup.cpp | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 0aa7a2d217..8c841540a5 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1442,6 +1442,11 @@ void LLTabContainer::selectLastTab() void LLTabContainer::selectNextTab() { + if (mTabList.size() == 0) + { + return; + } + BOOL tab_has_focus = FALSE; if (mCurrentTabIdx >= 0 && mTabList[mCurrentTabIdx]->mButton->hasFocus()) { diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 054e9530d4..f2d73a4043 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -272,12 +272,10 @@ void show_first_run_dialog(); bool first_run_dialog_callback(const LLSD& notification, const LLSD& response); void set_startup_status(const F32 frac, const std::string& string, const std::string& msg); bool login_alert_status(const LLSD& notification, const LLSD& response); -void login_packet_failed(void**, S32 result); void use_circuit_callback(void**, S32 result); void register_viewer_callbacks(LLMessageSystem* msg); void asset_callback_nothing(const LLUUID&, LLAssetType::EType, void*, S32); bool callback_choose_gender(const LLSD& notification, const LLSD& response); -void init_start_screen(S32 location_id); void release_start_screen(); void reset_login(); LLSD transform_cert_args(LLPointer cert);