diff options
author | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
commit | 5e56b2d4acaecf6b1c9e1789748b90836a7bd2c6 (patch) | |
tree | fc6a18bce3c560e5a5fbd25b224cc0d9ab580628 /indra/newview/llfolderview.h | |
parent | b2028085fdfddfd5a7ac0f52d9f34b84457b3b98 (diff) | |
parent | c89ff6e80be24f3c4c910b7f380ff587f5853455 (diff) |
merge
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; } |