merge in of error-refactor-3

concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen

4 files changed, 2 insertions, 35 deletions

diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 4ba47e7689..9e1a0ee12c 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -4402,33 +4402,6 @@ void process_secured_template_checksum_request(LLMessageSystem* msg, void**)
 	send_template_reply(msg, token);
 }
 
-void process_log_control(LLMessageSystem* msg, void**)
-{
-	U8 level;
-	U32 mask;
-	BOOL time;
-	BOOL location;
-	BOOL remote_infos;
-
-	msg->getU8Fast(_PREHASH_Options, _PREHASH_Level, level);
-	msg->getU32Fast(_PREHASH_Options, _PREHASH_Mask, mask);
-	msg->getBOOLFast(_PREHASH_Options, _PREHASH_Time, time);
-	msg->getBOOLFast(_PREHASH_Options, _PREHASH_Location, location);
-	msg->getBOOLFast(_PREHASH_Options, _PREHASH_RemoteInfos, remote_infos);
-
-	gErrorStream.setLevel(LLErrorStream::ELevel(level));
-	gErrorStream.setDebugMask(mask);
-	gErrorStream.setTime(time);
-	gErrorStream.setPrintLocation(location);
-	gErrorStream.setElevatedRemote(remote_infos);
-
-	llinfos << "Logging set to level " << gErrorStream.getLevel() 
-		<< " mask " << std::hex << gErrorStream.getDebugMask() << std::dec
-		<< " time " << gErrorStream.getTime()
-		<< " loc " << gErrorStream.getPrintLocation()
-		<< llendl;
-}
-
 void process_log_messages(LLMessageSystem* msg, void**)
 {
 	U8 log_message;
@@ -4749,7 +4722,6 @@ BOOL start_messaging_system(
 	gMessageSystem->setHandlerFuncFast(_PREHASH_PacketAck,             process_packet_ack,	    NULL);
 	gMessageSystem->setHandlerFuncFast(_PREHASH_TemplateChecksumRequest,  process_template_checksum_request,	NULL);
 	gMessageSystem->setHandlerFuncFast(_PREHASH_SecuredTemplateChecksumRequest,  process_secured_template_checksum_request,	NULL);
-	gMessageSystem->setHandlerFuncFast(_PREHASH_LogControl,			process_log_control,	NULL);
 	gMessageSystem->setHandlerFuncFast(_PREHASH_LogMessages,			process_log_messages,	NULL);
 	gMessageSystem->setHandlerFuncFast(_PREHASH_CreateTrustedCircuit,
 				       process_create_trusted_circuit,
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index ec76e1f755..48d950e377 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -187,6 +187,8 @@ class LLMessagePollInfo;
 
 class LLMessageSystem
 {
+	LOG_CLASS(LLMessageSystem);
+	
 public:
 	U8										mSendBuffer[MAX_BUFFER_SIZE];
 	// Encoded send buffer needs to be slightly larger since the zero
@@ -757,7 +759,6 @@ BOOL start_messaging_system(
 void end_messaging_system();
 
 void null_message_callback(LLMessageSystem *msg, void **data);
-void process_log_control(LLMessageSystem* msg, void**);
 
 //
 // Inlines
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 18be31af58..c2d7c9c2a3 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -489,7 +489,6 @@ char * _PREHASH_NVPair;
 char * _PREHASH_ObjectSpinStart;
 char * _PREHASH_UseEstateSun;
 char * _PREHASH_LogoutBlock;
-char * _PREHASH_RelayLogControl;
 char * _PREHASH_RegionID;
 char * _PREHASH_Creator;
 char * _PREHASH_ProposalText;
@@ -1294,7 +1293,6 @@ char * _PREHASH_AssetBlock;
 char * _PREHASH_AcceptNotices;
 char * _PREHASH_SetGroupAcceptNotices;
 char * _PREHASH_CloseCircuit;
-char * _PREHASH_LogControl;
 char * _PREHASH_TeleportFinish;
 char * _PREHASH_PathRevolutions;
 char * _PREHASH_ClassifiedInfoReply;
@@ -1963,7 +1961,6 @@ void init_prehash_data()
 	_PREHASH_ObjectSpinStart = gMessageStringTable.getString("ObjectSpinStart");
 	_PREHASH_UseEstateSun = gMessageStringTable.getString("UseEstateSun");
 	_PREHASH_LogoutBlock = gMessageStringTable.getString("LogoutBlock");
-	_PREHASH_RelayLogControl = gMessageStringTable.getString("RelayLogControl");
 	_PREHASH_RegionID = gMessageStringTable.getString("RegionID");
 	_PREHASH_Creator = gMessageStringTable.getString("Creator");
 	_PREHASH_ProposalText = gMessageStringTable.getString("ProposalText");
@@ -2768,7 +2765,6 @@ void init_prehash_data()
 	_PREHASH_AcceptNotices = gMessageStringTable.getString("AcceptNotices");
 	_PREHASH_SetGroupAcceptNotices = gMessageStringTable.getString("SetGroupAcceptNotices");
 	_PREHASH_CloseCircuit = gMessageStringTable.getString("CloseCircuit");
-	_PREHASH_LogControl = gMessageStringTable.getString("LogControl");
 	_PREHASH_TeleportFinish = gMessageStringTable.getString("TeleportFinish");
 	_PREHASH_PathRevolutions = gMessageStringTable.getString("PathRevolutions");
 	_PREHASH_ClassifiedInfoReply = gMessageStringTable.getString("ClassifiedInfoReply");
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h
index 0da2e02f83..63e23237f5 100644
--- a/indra/llmessage/message_prehash.h
+++ b/indra/llmessage/message_prehash.h
@@ -489,7 +489,6 @@ extern char * _PREHASH_NVPair;
 extern char * _PREHASH_ObjectSpinStart;
 extern char * _PREHASH_UseEstateSun;
 extern char * _PREHASH_LogoutBlock;
-extern char * _PREHASH_RelayLogControl;
 extern char * _PREHASH_RegionID;
 extern char * _PREHASH_Creator;
 extern char * _PREHASH_ProposalText;
@@ -1294,7 +1293,6 @@ extern char * _PREHASH_AssetBlock;
 extern char * _PREHASH_AcceptNotices;
 extern char * _PREHASH_SetGroupAcceptNotices;
 extern char * _PREHASH_CloseCircuit;
-extern char * _PREHASH_LogControl;
 extern char * _PREHASH_TeleportFinish;
 extern char * _PREHASH_PathRevolutions;
 extern char * _PREHASH_ClassifiedInfoReply;