diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
| commit | 19e0cc93a8af661dbac47552474a704ade600c74 (patch) | |
| tree | 5d7e539a4c98607a189c6e472732b75608379abb /indra/llui/llscrollcontainer.h | |
| parent | ee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff) | |
| parent | 3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff) | |
DRTVWR-139: merge back 3.3.1-beta2 fixes
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
| -rw-r--r-- | indra/llui/llscrollcontainer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h index 3aa79cc255..d87c95b3d7 100644 --- a/indra/llui/llscrollcontainer.h +++ b/indra/llui/llscrollcontainer.h @@ -91,7 +91,7 @@ public: void setReserveScrollCorner( BOOL b ) { mReserveScrollCorner = b; } LLRect getVisibleContentRect(); LLRect getContentWindowRect(); - const LLRect& getScrolledViewRect() const { return mScrolledView ? mScrolledView->getRect() : LLRect::null; } + virtual const LLRect getScrolledViewRect() const { return mScrolledView ? mScrolledView->getRect() : LLRect::null; } void pageUp(S32 overlap = 0); void pageDown(S32 overlap = 0); void goToTop(); @@ -116,6 +116,9 @@ public: bool autoScroll(S32 x, S32 y); +protected: + LLView* mScrolledView; + private: // internal scrollbar handlers virtual void scrollHorizontal( S32 new_pos ); @@ -124,7 +127,6 @@ private: void calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const; LLScrollbar* mScrollbar[SCROLLBAR_COUNT]; - LLView* mScrolledView; S32 mSize; BOOL mIsOpaque; LLUIColor mBackgroundColor; |