From 417dbeb68ef842a8eee22ebab35c89ddee653619 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 10 Jun 2023 01:33:43 +0300 Subject: SL-19823 Edit not always active #5 --- indra/newview/llinventorygallery.cpp | 2 +- indra/newview/llpanelmaininventory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp index 412e9e9c0b..898bcba494 100644 --- a/indra/newview/llinventorygallery.cpp +++ b/indra/newview/llinventorygallery.cpp @@ -1133,7 +1133,7 @@ void LLInventoryGallery::changeItemSelection(const LLUUID& item_id, bool scroll_ { return; } - if (mNeedsArrange && item_id.notNull() && scroll_to_selection) + if (mNeedsArrange && item_id.notNull()) { mItemToSelect = item_id; return; diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index de777fdc1a..e133bd37a1 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2425,7 +2425,7 @@ void LLPanelMainInventory::updateCombinationVisibility() } } - if (mCombInvUUIDNeedsRename.notNull()) + if (mCombInvUUIDNeedsRename.notNull() && mCombinationInventoryPanel->areViewsInitialized()) { mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, TRUE); mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection(); -- cgit v1.2.3