diff options
author | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
commit | 00e4fb0ac8431bda3705c218a548557cfca7e749 (patch) | |
tree | dd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/newview/llfolderview.h | |
parent | 657e462b6a46bee09fe91e84ea37763db79c868c (diff) | |
parent | bd897431e14aff091d5f45425816ddec4b2538c7 (diff) |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r-- | indra/newview/llfolderview.h | 2 |
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; |