summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-12 10:12:52 -0700
committerRichard Linden <none@none>2010-08-12 10:12:52 -0700
commit41fe9750c82605ccfbaf8f9b0f08b9068de702d3 (patch)
treed0e6bbffa926edff4d70d87bbf030bf28cd6953a /indra/newview/llfolderview.h
parent73f1f43b8bd9ae1c3bc7f96d652c30d772da113b (diff)
parent73952a37ed7a11331154f2f68050286722ec96da (diff)
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index f1d39a41ae..a7763e8eeb 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -274,7 +274,6 @@ public:
void dumpSelectionInformation();
virtual S32 notify(const LLSD& info) ;
- void setEnableScroll(bool enable_scroll) { mEnableScroll = enable_scroll; }
bool useLabelSuffix() { return mUseLabelSuffix; }
private:
@@ -309,7 +308,6 @@ protected:
LLLineEditor* mRenamer;
BOOL mNeedsScroll;
- bool mEnableScroll;
BOOL mPinningSelectedItem;
LLRect mScrollConstraintRect;
BOOL mNeedsAutoSelect;