From 3aa2655f5e8c7587e8cb91d314bfa6808ce71dac Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 10 Jun 2014 21:27:30 +0200
Subject: [PATCH] Fix merge issue in LLDebugText

---
 indra/newview/llviewerwindow.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 118dcdd1fe..9eb3934b38 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -231,6 +231,7 @@
 #include "lggcontactsets.h"
 
 #include "llleapmotioncontroller.h"
+#include "lltracerecording.h"
 
 //
 // Globals
@@ -374,7 +375,8 @@ public:
 			{
 			const U32 y_inc2 = 15;
 				// <FS:Ansariel> FIRE-9746: Show FPS with DebugShowTime
-				addText(xpos, ypos, llformat("FPS: %3.1f", LLViewerStats::getInstance()->mFPSStat.getMeanPerSec())); ypos += y_inc2;
+				addText(xpos, ypos, llformat("FPS: %3.1f", LLTrace::get_frame_recording().getPeriodMeanPerSec(LLStatViewer::FPS))); ypos += y_inc2;
+				
 				// </FS:Ansariel>
 				LLFrameTimer& timer = gTextureTimer;
 				F32 time = timer.getElapsedTimeF32();