From 92fe51ea596d5ff9e771924552de9fc34b2be1ff Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 30 Jan 2011 02:54:01 -0500
Subject: [PATCH] Backport startup logging fix

--HG--
branch : Firestorm_2.4.1
---
 indra/newview/lllogchat.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 9adf374c71..29f6693089 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -53,6 +53,7 @@
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/local_time_adjustor.hpp>
+#include "llstartup.h"
 
 const S32 LOG_RECALL_SIZE = 2048;
 
@@ -272,6 +273,10 @@ void LLLogChat::saveHistory(const std::string& filename,
 			    const LLUUID& from_id,
 			    const std::string& line)
 {
+	if(LLStartUp::getStartupState() <= STATE_LOGIN_CLEANUP)
+	{
+		return;
+	}
 	std::string tmp_filename = filename;
 	LLStringUtil::trim(tmp_filename);
 	if (tmp_filename.empty())