svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp
index b7d0267423..5fb3708859 100755
--- a/indra/llmessage/llsdmessagereader.cpp
+++ b/indra/llmessage/llsdmessagereader.cpp
@@ -71,14 +71,20 @@ LLSD getLLSD(const LLSD& input, const char* block, const char* var, S32 blocknum
 	}
 	if(! input[block].isArray())
 	{
-		llerrs << "block " << block << " not found" << llendl;
+		// NOTE: babbage: need to return default for missing blocks to allow
+		// backwards/forwards compatibility - handlers must cope with default
+		// values.
+		llwarns << "block " << block << " not found" << llendl;
 		return LLSD();
 	}
 
 	LLSD result = input[block][blocknum][var]; 
 	if(result.isUndefined())
 	{
-		llerrs << "var " << var << " not found" << llendl;
+		// NOTE: babbage: need to return default for missing vars to allow
+		// backwards/forwards compatibility - handlers must cope with default
+		// values.
+		llwarns << "var " << var << " not found" << llendl;
 	}
 	return result;
 }