QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 40e46b0ce9..80ea6ce96b 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -182,15 +182,15 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, const char *varname)
 {
 	// is there a message ready to go?
 	if (mReceiveSize == -1)
-	{
+	{	// This is a serious error - crash 
 		llerrs << "No message waiting for decode 4!" << llendl;
-		return -1;
+		return LL_MESSAGE_ERROR;
 	}
 
 	if (!mCurrentRMessageData)
-	{
+	{	// This is a serious error - crash
 		llerrs << "Invalid mCurrentRMessageData in getData!" << llendl;
-		return -1;
+		return LL_MESSAGE_ERROR;
 	}
 
 	char *bnamep = (char *)blockname; 
@@ -198,10 +198,10 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, const char *varname)
 	LLMsgData::msg_blk_data_map_t::const_iterator iter = mCurrentRMessageData->mMemberBlocks.find(bnamep);
 	
 	if (iter == mCurrentRMessageData->mMemberBlocks.end())
-	{
-		llerrs << "Block " << bnamep << " not in message "
+	{	// don't crash
+		llinfos << "Block " << bnamep << " not in message "
 			<< mCurrentRMessageData->mName << llendl;
-		return -1;
+		return LL_BLOCK_NOT_IN_MESSAGE;
 	}
 
 	char *vnamep = (char *)varname; 
@@ -210,17 +210,17 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, const char *varname)
 	LLMsgVarData& vardata = msg_data->mMemberVarData[vnamep];
 	
 	if (!vardata.getName())
-	{
-		llerrs << "Variable " << varname << " not in message "
+	{	// don't crash
+		llinfos << "Variable " << varname << " not in message "
 			<< mCurrentRMessageData->mName << " block " << bnamep << llendl;
-		return -1;
+		return LL_VARIABLE_NOT_IN_BLOCK;
 	}
 
 	if (mCurrentRMessageTemplate->mMemberBlocks[bnamep]->mType != MBT_SINGLE)
-	{
+	{	// This is a serious error - crash
 		llerrs << "Block " << bnamep << " isn't type MBT_SINGLE,"
 			" use getSize with blocknum argument!" << llendl;
-		return -1;
+		return LL_MESSAGE_ERROR;
 	}
 
 	return vardata.getSize();
@@ -230,15 +230,15 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, S32 blocknum, const
 {
 	// is there a message ready to go?
 	if (mReceiveSize == -1)
-	{
+	{	// This is a serious error - crash
 		llerrs << "No message waiting for decode 5!" << llendl;
-		return -1;
+		return LL_MESSAGE_ERROR;
 	}
 
 	if (!mCurrentRMessageData)
-	{
+	{	// This is a serious error - crash
 		llerrs << "Invalid mCurrentRMessageData in getData!" << llendl;
-		return -1;
+		return LL_MESSAGE_ERROR;
 	}
 
 	char *bnamep = (char *)blockname + blocknum; 
@@ -247,20 +247,20 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, S32 blocknum, const
 	LLMsgData::msg_blk_data_map_t::const_iterator iter = mCurrentRMessageData->mMemberBlocks.find(bnamep);
 	
 	if (iter == mCurrentRMessageData->mMemberBlocks.end())
-	{
-		llerrs << "Block " << bnamep << " not in message "
+	{	// don't crash
+		llinfos << "Block " << bnamep << " not in message " 
 			<< mCurrentRMessageData->mName << llendl;
-		return -1;
+		return LL_BLOCK_NOT_IN_MESSAGE;
 	}
 
 	LLMsgBlkData* msg_data = iter->second;
 	LLMsgVarData& vardata = msg_data->mMemberVarData[vnamep];
 	
 	if (!vardata.getName())
-	{
-		llerrs << "Variable " << vnamep << " not in message "
+	{	// don't crash
+		llinfos << "Variable " << vnamep << " not in message "
 			<<  mCurrentRMessageData->mName << " block " << bnamep << llendl;
-		return -1;
+		return LL_VARIABLE_NOT_IN_BLOCK;
 	}
 
 	return vardata.getSize();