diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
| commit | a4913246770b58ed569021c484c213231aaae549 (patch) | |
| tree | 0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/llui/llscrollcontainer.h | |
| parent | 80c2abddcfbcb578e70d220baa95aebdee3d529c (diff) | |
| parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) | |
merge up to latest viewer-release
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; |