merge in of error-refactor-3

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

4 files changed, 6 insertions, 37 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index cf80a72282..4ff07e9976 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -28,6 +28,7 @@
 #include "llcrypto.h"
 #include "lldir.h"
 #include "lleconomy.h"
+#include "llerrorcontrol.h"
 #include "llfiltersd2xmlrpc.h"
 #include "llfocusmgr.h"
 #include "imageids.h"
@@ -421,7 +422,6 @@ BOOL idle_startup()
 								  invalid_message_callback,
 								  NULL);
 
-			gErrorStream.setUTCTimestamp(gLogUTC);
 			if (gSavedSettings.getBOOL("LogMessages") || gLogMessages)
 			{
 				llinfos << "Message logging activated!" << llendl;
@@ -1679,7 +1679,7 @@ BOOL idle_startup()
 			// Move the progress view in front of the UI
 			gViewerWindow->moveProgressViewToFront();
 
-			gErrorStream.setFixedBuffer(gDebugView->mDebugConsolep);
+			LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
 			// set initial visibility of debug console
 			gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));
 			gDebugView->mStatViewp->setVisible(gSavedSettings.getBOOL("ShowDebugStats"));
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 7ef1fd82c6..49578b186d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -430,8 +430,6 @@ void handle_dump_image_list(void*);
 void handle_fullscreen_debug(void*);
 void handle_crash(void*);
 void handle_dump_followcam(void*);
-void handle_viewer_enable_circuit_log(void*);
-void handle_viewer_disable_circuit_log(void*);
 void handle_viewer_enable_message_log(void*);
 void handle_viewer_disable_message_log(void*);
 void handle_send_postcard(void*);
@@ -818,10 +816,6 @@ void init_client_menu(LLMenuGL* menu)
 		LLMenuGL* sub = NULL;
 		sub = new LLMenuGL("Network");
 
-		sub->append(new LLMenuItemCallGL("Enable Circuit Log",  
-			&handle_viewer_enable_circuit_log,  NULL));
-		sub->append(new LLMenuItemCallGL("Disable Circuit Log", 
-			&handle_viewer_disable_circuit_log, NULL));
 		sub->append(new LLMenuItemCallGL("Enable Message Log",  
 			&handle_viewer_enable_message_log,  NULL));
 		sub->append(new LLMenuItemCallGL("Disable Message Log", 
@@ -1307,11 +1301,6 @@ void init_server_menu(LLMenuGL* menu)
 			&handle_normal_llinfo_log, &enable_god_customer_service));
 
 		sub_menu->appendSeparator();
-		sub_menu->append(new LLMenuItemCallGL("Enable Circuit Log",  
-			&handle_sim_enable_circuit_log,  &enable_god_customer_service));
-		sub_menu->append(new LLMenuItemCallGL("Disable Circuit Log", 
-			&handle_sim_disable_circuit_log, &enable_god_customer_service));
-		sub_menu->appendSeparator();
 		sub_menu->append(new LLMenuItemCallGL("Enable Message Log",  
 			&handle_sim_enable_message_log,  &enable_god_customer_service));
 		sub_menu->append(new LLMenuItemCallGL("Disable Message Log", 
@@ -6375,24 +6364,6 @@ void handle_dump_followcam(void*)
 	LLFollowCamMgr::dump();
 }
 
-void handle_viewer_enable_circuit_log(void*)
-{
-	llinfos << "Showing circuit information every " << gMessageSystem->mCircuitPrintFreq << " seconds" << llendl;
-	gErrorStream.setLevel( LLErrorStream::DEBUG );
-	gErrorStream.setDebugFlag( LLERR_CIRCUIT_INFO );
-	// and dump stuff out immediately
-	gMessageSystem->dumpCircuitInfo();
-}
-
-void handle_viewer_disable_circuit_log(void*)
-{
-	llinfos << "Hiding circuit information" << llendl;
-#if !LL_DEBUG
-	gErrorStream.setLevel( LLErrorStream::INFO );
-#endif
-	gErrorStream.clearDebugFlag( LLERR_CIRCUIT_INFO );
-}
-
 void handle_viewer_enable_message_log(void*)
 {
 	gMessageSystem->startLogging();
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index a2ef97fc6b..50b84babd1 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -63,8 +63,6 @@
 #include "lldqueueptr.h"
 #include "llendianswizzle.h"
 #include "llerror.h"
-#include "llerrorbuffer.h"
-#include "llerrorstream.h"
 #include "llfasttimer.h"
 #include "llfixedbuffer.h"
 #include "llframetimer.h"
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index c2726997b2..cc8f955bc6 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -324,9 +324,9 @@ bool LLXMLRPCTransaction::Impl::process()
 			if (curl_msg->data.result != CURLE_OK)
 			{
 				setCurlStatus(curl_msg->data.result);
-				llalerts << "LLXMLRPCTransaction CURL error "
+				llwarns << "LLXMLRPCTransaction CURL error "
 					<< mCurlCode << ": " << mCurlErrorBuffer << llendl;
-				llalerts << "LLXMLRPCTransaction request URI: "
+				llwarns << "LLXMLRPCTransaction request URI: "
 					<< mURI << llendl;
 					
 				return true;
@@ -360,11 +360,11 @@ bool LLXMLRPCTransaction::Impl::process()
 			{
 				setStatus(LLXMLRPCTransaction::StatusXMLRPCError);
 				
-				llalerts << "LLXMLRPCTransaction XMLRPC "
+				llwarns << "LLXMLRPCTransaction XMLRPC "
 					<< (hasError ? "error " : "fault ")
 					<< faultCode << ": "
 					<< faultString << llendl;
-				llalerts << "LLXMLRPCTransaction request URI: "
+				llwarns << "LLXMLRPCTransaction request URI: "
 					<< mURI << llendl;
 			}