Merge branch 'master' into DRTVWR-514-keymappings

# Conflicts:
#	indra/llui/llscrolllistctrl.cpp

1 files changed, 18 insertions, 0 deletions

diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 80a414d00f..ead8634df4 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -641,6 +641,24 @@ LLSD LLControlGroup::getLLSD(const std::string& name)
 	return get<LLSD>(name);
 }
 
+LLSD LLControlGroup::asLLSD(bool diffs_only)
+{
+	// Dump all stored values as LLSD
+	LLSD result = LLSD::emptyArray();
+	for (ctrl_name_table_t::iterator iter = mNameTable.begin();
+		 iter != mNameTable.end(); iter++)
+	{
+		LLControlVariable *control = iter->second;
+		if (!control || control->isType(TYPE_STRING) || (diffs_only && control->isDefault()))
+		{
+			continue;
+		}
+		const std::string& name = iter->first;
+		result[name] = getLLSD(name);
+	}
+	return result;
+}
+
 BOOL LLControlGroup::controlExists(const std::string& name)
 {
 	ctrl_name_table_t::iterator iter = mNameTable.find(name);