diff options
author | Mark Lentczner <markl@lindenlab.com> | 2007-02-06 00:57:33 +0000 |
---|---|---|
committer | Mark Lentczner <markl@lindenlab.com> | 2007-02-06 00:57:33 +0000 |
commit | d0d4670f4941dcf7430fb1269c6613140ecf3ff7 (patch) | |
tree | e3d6b59c19cac6bc172ec5fb0131ffc8f4923b75 /indra/llmessage/message.cpp | |
parent | 77f04c74eb1603bf2fadc30127d05378bfc7a48a (diff) |
merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
Diffstat (limited to 'indra/llmessage/message.cpp')
-rw-r--r-- | indra/llmessage/message.cpp | 28 |
1 files changed, 0 insertions, 28 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, |