From da343188ff07bcfc86b3d72a93f327be4f2607e2 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 10 May 2013 11:52:08 -0400
Subject: fix merge error in 3.5.2 merge
---
indra/newview/llviewerstatsrecorder.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
index f5a4737c59..bba089fb30 100755
--- a/indra/newview/llviewerstatsrecorder.cpp
+++ b/indra/newview/llviewerstatsrecorder.cpp
@@ -254,7 +254,7 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
<< "\t" << (mTextureFetchSize * 8 / delta_time)
<< "\n";
- size_t data_size = data_msg.str().size();
+ data_size = data_msg.str().size();
if ( data_size != fwrite(data_msg.str().c_str(), 1, data_size, mObjectCacheFile ))
{
llwarns << "Unable to write complete column data to " << STATS_FILE_NAME << llendl;
--
cgit v1.2.3