diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 15:21:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 15:21:33 -0700 |
| commit | 5d08d1e3bd2de3e0e66ef836ada714fce98733b4 (patch) | |
| tree | b4ca229179511d5d4077635a696160b784127dbc /indra/llui/lltoolbar.h | |
| parent | 4ee79abdca66f73aaba25ebf0b874bd422db46f6 (diff) | |
| parent | a8fcfc5e19811ce579799d415a9ad63a0f1f6dc7 (diff) | |
Merge with latest
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 407cbde7d2..3c317e10a2 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -45,7 +45,7 @@ class LLToolBarButton : public LLButton public: struct Params : public LLInitParam::Block<Params, LLButton::Params> { - Optional<LLUI::Range<S32> > button_width; + Optional<LLUI::RangeS32> button_width; Optional<S32> desired_height; Params() @@ -67,7 +67,7 @@ private: LLCommandId mId; S32 mMouseDownX; S32 mMouseDownY; - LLUI::Range<S32> mWidthRange; + LLUI::RangeS32 mWidthRange; S32 mDesiredHeight; bool mIsDragged; startdrag_callback_t mStartDragItemCallback; |