From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/newview/lllogchat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lllogchat.cpp')

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 91e6ef1e05..76a4ec99b1 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -47,7 +47,7 @@ LLString LLLogChat::makeLogFileName(LLString filename)
 
 LLString LLLogChat::timestamp(bool withdate)
 {
-	U32 utc_time;
+	time_t utc_time;
 	utc_time = time_corrected();
 
 	// There's only one internal tm buffer.
-- 
cgit v1.2.3