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/newview/llstartup.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/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 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")); |