diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 22 | ||||
| -rw-r--r-- | indra/newview/llpanelmaininventory.h | 2 |
2 files changed, 3 insertions, 21 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 6a5b0eebed..e4de6078f3 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -121,9 +121,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p) mForceShowInvLayout(false), mViewMode(MODE_COMBINATION), mListViewRootUpdatedConnection(), - mGalleryRootUpdatedConnection(), - mDelayedCombGalleryScroll(false), - mDelayedCombInvPanelScroll(false) + mGalleryRootUpdatedConnection() { // Menu Callbacks (non contex menus) mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2)); @@ -2548,26 +2546,12 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w if(mCombinationGalleryPanel->getFilter().checkAgainstFilterThumbnails(item_id)) { mCombinationGalleryPanel->changeItemSelection(item_id, false); - if(new_window) - { - mDelayedCombGalleryScroll = new_window; - } - else - { - scrollToGallerySelection(); - } + scrollToGallerySelection(); } else { mCombinationInventoryPanel->setSelection(item_id, true); - if(new_window) - { - mDelayedCombInvPanelScroll = new_window; - } - else - { - scrollToInvPanelSelection(); - } + scrollToInvPanelSelection(); } } else if (mSingleFolderMode && isListViewMode()) diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 61ccfc02a1..ae2e07da11 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -250,8 +250,6 @@ private: bool mForceShowInvLayout; bool mReshapeInvLayout; - bool mDelayedCombGalleryScroll; - bool mDelayedCombInvPanelScroll; // List Commands // //////////////////////////////////////////////////////////////////////////////// }; |