diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-13 17:36:29 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-13 17:36:29 -0500 |
commit | e4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (patch) | |
tree | 87aeed34bc9378648e1b8729bacf8462b4d9ec2d /indra/llui/llmenugl.h | |
parent | 20bc02d2544320a5ad99c61b8d012608319e3161 (diff) | |
parent | d8aa31d10a89aa826cc549594c083a054a2ad967 (diff) |
merged .hgtags
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 |