diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 11:52:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 11:52:08 -0400 |
| commit | da343188ff07bcfc86b3d72a93f327be4f2607e2 (patch) | |
| tree | 20d34fbaeddcc15d5bab1c8ace7d0d4db66de761 /indra/newview | |
| parent | 4d22c32aa9ac42b4a720200386d68339e8656974 (diff) | |
fix merge error in 3.5.2 merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerstatsrecorder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |