summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-03 17:03:22 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-03 17:03:22 +0300
commit8544752ea30250243593575c03ca2e7e6156b15c (patch)
treed50aaa0aa62da430d51d8497c0b02e2480fa2581 /indra/newview/llfolderview.h
parentdd6d7dde7e27130b72693c4bea0661c6b01efff2 (diff)
parent39965cf6e809175890966ad1f401f094150692cb (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h2
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; }