diff options
author | Richard Nelson <none@none> | 2010-08-02 19:45:35 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-08-02 19:45:35 -0700 |
commit | 39965cf6e809175890966ad1f401f094150692cb (patch) | |
tree | 989ba4c6ea9192330f2f70b0140aeacd759f0bf9 /indra/newview/llfolderview.h | |
parent | df5d5b841484b5f94b86177cfc7d29a5d9a5b94e (diff) | |
parent | b3b8ef25e192f5713c9d5ca47289499b17ff07d1 (diff) |
merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r-- | indra/newview/llfolderview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index c69f08eb2d..f1d39a41ae 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -262,8 +262,8 @@ public: BOOL needsAutoSelect() { return mNeedsAutoSelect && !mAutoSelectOverride; } BOOL needsAutoRename() { return mNeedsAutoRename; } void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; } - void setAutoSelectOverride(BOOL val) { mAutoSelectOverride = val; } void setPinningSelectedItem(BOOL val) { mPinningSelectedItem = val; } + void setAutoSelectOverride(BOOL val) { mAutoSelectOverride = val; } void setCallbackRegistrar(LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* registrar) { mCallbackRegistrar = registrar; } |