SL-19823 Edit not always active #5

2 files changed, 2 insertions, 2 deletions

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();