From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 21 Jun 2007 22:40:22 +0000
Subject: merge -r62831:64079 branches/maintenance to release
---
indra/newview/llfolderview.h | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'indra/newview/llfolderview.h')
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 248118dfdf..97071862de 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -216,6 +216,9 @@ public:
//RN: this is public to allow system to externally force a global refilter
void setModified(EFilterBehavior behavior = FILTER_RESTART);
+ void toLLSD(LLSD& data);
+ void fromLLSD(LLSD& data);
+
protected:
struct filter_ops
{
@@ -839,6 +842,9 @@ public:
static void idle(void* user_data);
BOOL needsAutoSelect() { return mNeedsAutoSelect && !mAutoSelectOverride; }
+ BOOL needsAutoRename() { return mNeedsAutoRename; }
+ void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; }
+
BOOL getDebugFilters() { return mDebugFilters; }
// DEBUG only
@@ -870,6 +876,7 @@ protected:
LLCoordGL mLastScrollOffset;
BOOL mNeedsAutoSelect;
BOOL mAutoSelectOverride;
+ BOOL mNeedsAutoRename;
BOOL mDebugFilters;
U32 mSortOrder;
--
cgit v1.2.3