From 81752116e1243d68ae67c4771f267c4170dd9028 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 20 Sep 2023 18:48:13 +0300 Subject: [PATCH 1/6] SL-20298 Fix recursive fetch not working properly. --- indra/newview/llinventorymodelbackgroundfetch.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 07d5713fc8..91adef8047 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -864,7 +864,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc else { // Already fetched, check if anything inside needs fetching - if (fetch_info.mFetchType == FT_RECURSIVE) + if (fetch_info.mFetchType == FT_RECURSIVE + || fetch_info.mFetchType == FT_FOLDER_AND_CONTENT) { LLInventoryModel::cat_array_t * categories(NULL); LLInventoryModel::item_array_t * items(NULL); From b88f0e40a584e3a0d9ff3fe11b1eda41fb89a29a Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 20 Sep 2023 21:14:30 +0300 Subject: [PATCH 2/6] SL-20308 Clearing user's data should clear mfa #2 --- indra/newview/llfloaterforgetuser.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp index 7f168df0c5..f576ce7a76 100644 --- a/indra/newview/llfloaterforgetuser.cpp +++ b/indra/newview/llfloaterforgetuser.cpp @@ -164,6 +164,12 @@ bool LLFloaterForgetUser::onConfirmLogout(const LLSD& notification, const LLSD& if (option == 0) { // Remove creds + std::string grid_id = LLGridManager::getInstance()->getGridId(grid); + if (grid_id.empty()) + { + grid_id = grid; + } + gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid_id, LLStartUp::getUserId()); // doesn't write gSecAPIHandler->removeFromCredentialMap("login_list", grid, LLStartUp::getUserId()); LLPointer cred = gSecAPIHandler->loadCredential(grid); From 627a6a2d0fb9b041d42d98a7b6301793ca8a7184 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 25 Sep 2023 20:17:06 +0300 Subject: [PATCH 3/6] SL-20332 Crash at dragCategoryIntoFolder --- indra/newview/llinventorybridge.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 481b221870..73005d6903 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2982,7 +2982,10 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, move_it != move_inv->mMoveList.end(); ++move_it) { - cb->fire(move_it->second); + if (cb) + { + cb->fire(move_it->second); + } } }; accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, callback, NULL, filter); From 226081b27511ad45fbeaa16b9226265dc446976b Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 25 Sep 2023 20:24:57 +0300 Subject: [PATCH 4/6] SL-20334 Unable to use non-square textures from inventory --- indra/newview/lltexturectrl.cpp | 4 +++- indra/newview/lltexturectrl.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 0c3730d084..2e137a8e12 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -176,6 +176,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mSelectedItemPinned( FALSE ), mCanApply(true), mCanPreview(true), + mLimitsSet(false), mMaxDim(S32_MAX), mMinDim(0), mPreviewSettingChanged(false), @@ -282,7 +283,7 @@ bool LLFloaterTexturePicker::updateImageStats() S32 height = mTexturep->getFullHeight(); if (width > 0 && height > 0) { - if (width != height + if ((mLimitsSet && (width != height)) || width < mMinDim || width > mMaxDim || height < mMinDim @@ -1200,6 +1201,7 @@ void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool void LLFloaterTexturePicker::setMinDimentionsLimits(S32 min_dim) { mMinDim = min_dim; + mLimitsSet = true; std::string formatted_dims = llformat("%dx%d", mMinDim, mMinDim); mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims); diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 7239b97552..e2bfe286d3 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -403,6 +403,7 @@ private: bool mCanApply; bool mCanPreview; bool mPreviewSettingChanged; + bool mLimitsSet; S32 mMaxDim; S32 mMinDim; From f352fd1090ce4d50db349cdadfa61d66783a20e8 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 26 Sep 2023 19:36:39 +0300 Subject: [PATCH 5/6] SL-20341 Item Properties floater closes on changes for task inventory item --- indra/newview/llsidepaneliteminfo.cpp | 11 +++++++++++ indra/newview/llviewerobject.cpp | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 6fc9c8c6b5..d6d5a4ef2d 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -257,6 +257,17 @@ void LLSidepanelItemInfo::refresh() } return; } + + if (mObjectID.notNull()) + { + LLViewerObject* object = gObjectList.findObject(mObjectID); + if (object) + { + // Object exists, but object's content is not nessesary + // loaded, so assume item exists as well + return; + } + } if (mParentFloater) { diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 011bea71a4..9275cfb86d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -6034,7 +6034,7 @@ LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 para } default: { - LL_INFOS() << "Unknown param type." << LL_ENDL; + LL_INFOS_ONCE() << "Unknown param type: " << param_type << LL_ENDL; break; } }; From 2465470817957c8378e81ec1a7e32551fbac7b26 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 3 Oct 2023 11:20:43 -0400 Subject: [PATCH 6/6] Increment viewer version to 6.6.16 following promotion of DRTVWR-567 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index b69c12176f..5235a3e6f4 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.6.15 +6.6.16