summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-03-03 12:10:00 -0800
committerEli Linden <eli@lindenlab.com>2010-03-03 12:10:00 -0800
commite47d107e2f7c4793f0685aa37749629f7d91aef0 (patch)
tree740e36a63f6576bdf5c180ca8b59796ae5f1cf49 /indra/newview/llfolderview.h
parentece36d5df8d0a7fb4c71ec50a0bac49a5c6fbacb (diff)
parent2ecc98cb2f11b03224990d498d20cff8bcfb0716 (diff)
Merge
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;