diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-02 13:44:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-02 13:44:18 -0700 |
| commit | 353f7ea61873d9f35685a59b4102899b4a9e596e (patch) | |
| tree | 3ca2964682d7e5e23b7a178a854c567c7c5384d9 /indra/llui/llmenugl.cpp | |
| parent | 139c13bdc0387f50d9f3a71737a95a4585bc471c (diff) | |
| parent | 334d8f4076b4045e8fd4ede5fd9d31f0b185ded4 (diff) | |
Pull from richard/viewer-experience
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 3ef8d8ff35..cb237fca7c 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -1686,7 +1686,8 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p) mSpilloverMenu(NULL), mJumpKey(p.jump_key), mCreateJumpKeys(p.create_jump_keys), - mNeedsArrange(FALSE), + mNeedsArrange(FALSE), + mResetScrollPositionOnShow(true), mShortcutPad(p.shortcut_pad) { typedef boost::tokenizer<boost::char_separator<char> > tokenizer; @@ -3043,7 +3044,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y) S32 mouse_x, mouse_y; // Resetting scrolling position - if (menu->isScrollable()) + if (menu->isScrollable() && menu->isScrollPositionOnShowReset()) { menu->mFirstVisibleItem = NULL; } |