diff options
author | Richard Linden <none@none> | 2010-08-12 10:10:09 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-08-12 10:10:09 -0700 |
commit | 73952a37ed7a11331154f2f68050286722ec96da (patch) | |
tree | 7ce6c9f6d0c3f6b0e85efc57736340106329beb4 /indra/newview/llfolderview.h | |
parent | e16c1f6fdd300f284f0b39b76b4e82f7366b5cdb (diff) | |
parent | 402e2a181831d30a6a2586fd4b0641ba66da99be (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; |