summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-03 11:07:52 -0500
committerLoren Shih <seraph@lindenlab.com>2010-03-03 11:07:52 -0500
commit8e37dd516ab68bf11aaa9ab76945de36053df057 (patch)
treefa790d4832fc46c1b9349314f1b7d1fef8987acd /indra/newview/llfolderview.h
parent0ac63ffbb1acb32278645f6a9ab97cdc271c8d30 (diff)
parentf53f121eb069dbf50334c424390151074d4fcad7 (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index faf6a9cf23..38255b3cea 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -269,6 +269,7 @@ public:
void dumpSelectionInformation();
virtual S32 notify(const LLSD& info) ;
+ void setEnableScroll(bool enable_scroll) { mEnableScroll = enable_scroll; }
private:
void updateRenamerPosition();
@@ -300,6 +301,7 @@ protected:
LLLineEditor* mRenamer;
BOOL mNeedsScroll;
+ bool mEnableScroll;
BOOL mPinningSelectedItem;
LLRect mScrollConstraintRect;
BOOL mNeedsAutoSelect;