diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp index a7dfbb5938d8b69db00262c1082ab28f12819054..694881372dba15615ce9a944093e8901106c9ee9 100644 --- a/indra/newview/llinventorygallery.cpp +++ b/indra/newview/llinventorygallery.cpp @@ -379,7 +379,7 @@ void LLInventoryGallery::reArrangeRows(S32 row_diff) std::vector<LLInventoryGalleryItem*> buf_items = mItems; for (std::vector<LLInventoryGalleryItem*>::const_reverse_iterator it = buf_items.rbegin(); it != buf_items.rend(); ++it) { - removeFromGalleryLast(*it); + removeFromGalleryLast(*it, false); } for (std::vector<LLInventoryGalleryItem*>::const_reverse_iterator it = mHiddenItems.rbegin(); it != mHiddenItems.rend(); ++it) { @@ -492,7 +492,7 @@ void LLInventoryGallery::addToGallery(LLInventoryGalleryItem* item) } -void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item) +void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item, bool needs_reshape) { if(item->isHidden()) { @@ -518,7 +518,10 @@ void LLInventoryGallery::removeFromGalleryLast(LLInventoryGalleryItem* item) } removeLastRow(); } - reshapeGalleryPanel(row_count); + if (needs_reshape) + { + reshapeGalleryPanel(row_count); + } } diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h index e314281a07638304e70f0462bf2258ae4ef65edd..ce618602dfe94bc86aab8b3cd2f8902a76d4d268 100644 --- a/indra/newview/llinventorygallery.h +++ b/indra/newview/llinventorygallery.h @@ -189,7 +189,7 @@ class LLInventoryGallery : public LLPanel, public LLEditMenuHandler private: void addToGallery(LLInventoryGalleryItem* item); - void removeFromGalleryLast(LLInventoryGalleryItem* item); + void removeFromGalleryLast(LLInventoryGalleryItem* item, bool needs_reshape = true); void removeFromGalleryMiddle(LLInventoryGalleryItem* item); LLPanel* addLastRow(); void removeLastRow();