diff options
| author | Richard Linden <none@none> | 2010-08-12 10:12:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 10:12:52 -0700 |
| commit | 41fe9750c82605ccfbaf8f9b0f08b9068de702d3 (patch) | |
| tree | d0e6bbffa926edff4d70d87bbf030bf28cd6953a /indra/newview/llinventorypanel.cpp | |
| parent | 73f1f43b8bd9ae1c3bc7f96d652c30d772da113b (diff) | |
| parent | 73952a37ed7a11331154f2f68050286722ec96da (diff) | |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index ac92f41624..770bc02b40 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -175,6 +175,9 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params) setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER)); } mFolderRoot->setSortOrder(getFilter()->getSortOrder()); + + // Initialize base class params. + LLPanel::initFromParams(params); } LLInventoryPanel::~LLInventoryPanel() @@ -706,21 +709,6 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, return handled; } -// virtual -void LLInventoryPanel::onMouseEnter(S32 x, S32 y, MASK mask) -{ - LLPanel::onMouseEnter(x, y, mask); - // don't auto-scroll a list when cursor is over Inventory. See EXT-3981. - mFolderRoot->setEnableScroll(false); -} - -// virtual -void LLInventoryPanel::onMouseLeave(S32 x, S32 y, MASK mask) -{ - LLPanel::onMouseLeave(x, y, mask); - mFolderRoot->setEnableScroll(true); -} - void LLInventoryPanel::onFocusLost() { // inventory no longer handles cut/copy/paste/delete |