diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-20 12:44:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-20 12:44:34 -0400 |
| commit | 1c12103539437f1adacbdbb04005e134be264fe3 (patch) | |
| tree | 9c26986916c66e49444ede9170a64436d9ff3c7f /indra/llui/llmenugl.h | |
| parent | d3f3dd0998ee8a2159a98d2d8b4b02dce6176252 (diff) | |
| parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) | |
pull changes back from 2.3 beta
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 19b738312e..35544402f4 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -397,6 +397,15 @@ public: static const std::string ARROW_UP; static const std::string ARROW_DOWN; + // for scrollable menus + typedef enum e_scrolling_direction + { + SD_UP = 0, + SD_DOWN = 1, + SD_BEGIN = 2, + SD_END = 3 + } EScrollingDirection; + protected: LLMenuGL(const LLMenuGL::Params& p); friend class LLUICtrlFactory; @@ -503,8 +512,7 @@ public: S32 getShortcutPad() { return mShortcutPad; } - void scrollItemsUp(); - void scrollItemsDown(); + bool scrollItems(EScrollingDirection direction); BOOL isScrollable() const { return mScrollable; } static class LLMenuHolderGL* sMenuContainer; |