summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-11-02 10:49:04 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-11-02 10:49:04 -0700
commit405602baa624d916f200f2cd1e8343ba7b4633ff (patch)
treee4509081f1c2c2a25b167822bb966568c1916bd6 /indra/newview
parentf0759dea4a43f0d7610b265c84a1acfad058b1cb (diff)
parentba2fa73aaab5415c38fd9f489c590d8cba05e24f (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfavoritesbar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 6c9058caf1..1f269fb666 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1197,7 +1197,9 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
LLToggleableMenu* menu = (LLToggleableMenu*) mOverflowMenuHandle.get();
if (mRestoreOverflowMenu && menu && !menu->getVisible())
{
+ menu->resetScrollPositionOnShow(false);
showDropDownMenu();
+ menu->resetScrollPositionOnShow(true);
}
}