summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.h
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-12-11 10:08:37 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-12-11 10:08:37 -0800
commit941497dd30c409a2f352b0bfc1c48bfaca5ea76e (patch)
treeed7bdc596ee0a856f9739864239f75c64db85f50 /indra/llui/llscrollcontainer.h
parent4b710367a1ac986e8be731bc391c0b375424148f (diff)
parent0a8d9fa5b5d044bed7d4c38ec51d87bc90f3b3a6 (diff)
merge
Diffstat (limited to 'indra/llui/llscrollcontainer.h')
-rw-r--r--indra/llui/llscrollcontainer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index ac8ffe5258..25dcd071ab 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -96,7 +96,7 @@ public:
void setReserveScrollCorner( BOOL b ) { mReserveScrollCorner = b; }
LLRect getVisibleContentRect();
- LLRect getContentWindowRect() const;
+ LLRect getContentWindowRect();
const LLRect& getScrolledViewRect() const { return mScrolledView ? mScrolledView->getRect() : LLRect::null; }
void pageUp(S32 overlap = 0);
void pageDown(S32 overlap = 0);