svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

Merge latest 1.26 into trunk

1 files changed, 9 insertions, 4 deletions

diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 3be781ef78..ba0a1c7cbf 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -39,6 +39,8 @@
 #include "llstring.h"
 #include "llrect.h"
 
+#include "llcontrolgroupreader.h"
+
 #include <vector>
 
 // *NOTE: boost::visit_each<> generates warning 4675 on .net 2003
@@ -93,7 +95,8 @@ private:
 	std::string		mName;
 	std::string		mComment;
 	eControlType	mType;
-	bool mPersist;
+	bool			mPersist;
+	bool			mHideFromSettingsEditor;
 	std::vector<LLSD> mValues;
 	
 	signal_t mSignal;
@@ -101,7 +104,7 @@ private:
 public:
 	LLControlVariable(const std::string& name, eControlType type,
 					  LLSD initial, const std::string& comment,
-					  bool persist = true);
+					  bool persist = true, bool hidefromsettingseditor = false);
 
 	virtual ~LLControlVariable();
 	
@@ -118,6 +121,7 @@ public:
 	bool isDefault() { return (mValues.size() == 1); }
 	bool isSaveValueDefault();
 	bool isPersisted() { return mPersist; }
+	bool isHiddenFromSettingsEditor() { return mHideFromSettingsEditor; }
 	LLSD get()			const	{ return getValue(); }
 	LLSD getValue()		const	{ return mValues.back(); }
 	LLSD getDefault()	const	{ return mValues.front(); }
@@ -127,6 +131,7 @@ public:
 	void setValue(const LLSD& value, bool saved_value = TRUE);
 	void setDefaultValue(const LLSD& value);
 	void setPersist(bool state);
+	void setHiddenFromSettingsEditor(bool hide);
 	void setComment(const std::string& comment);
 
 	void firePropertyChanged()
@@ -140,7 +145,7 @@ private:
 };
 
 //const U32 STRING_CACHE_SIZE = 10000;
-class LLControlGroup
+class LLControlGroup : public LLControlGroupReader
 {
 protected:
 	typedef std::map<std::string, LLPointer<LLControlVariable> > ctrl_name_table_t;
@@ -164,7 +169,7 @@ public:
 	};
 	void applyToAll(ApplyFunctor* func);
 	
-	BOOL declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, BOOL persist);
+	BOOL declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, BOOL persist, BOOL hidefromsettingseditor = FALSE);
 	BOOL declareU32(const std::string& name, U32 initial_val, const std::string& comment, BOOL persist = TRUE);
 	BOOL declareS32(const std::string& name, S32 initial_val, const std::string& comment, BOOL persist = TRUE);
 	BOOL declareF32(const std::string& name, F32 initial_val, const std::string& comment, BOOL persist = TRUE);