diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-11 09:28:32 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-11 09:28:32 -0500 |
commit | e0759c82be89963c105fbc906ce219d1e922a636 (patch) | |
tree | 572f06d8f2b96fa600186d4b67d181485e284b02 /indra/llui/llmenugl.h | |
parent | 4b36aeb9736fb71de7087063444652c9d87f370c (diff) | |
parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) |
merge
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r-- | indra/llui/llmenugl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 77db588390..bdae899933 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -516,6 +516,9 @@ public: static class LLMenuHolderGL* sMenuContainer; + void resetScrollPositionOnShow(bool reset_scroll_pos) { mResetScrollPositionOnShow = reset_scroll_pos; } + bool isScrollPositionOnShowReset() { return mResetScrollPositionOnShow; } + protected: void createSpilloverBranch(); void cleanupSpilloverBranch(); @@ -565,6 +568,7 @@ private: KEY mJumpKey; BOOL mCreateJumpKeys; S32 mShortcutPad; + bool mResetScrollPositionOnShow; }; // end class LLMenuGL |