From cef03d52cb30e64510541519a9c2a2ad78603d80 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 25 Jan 2012 20:14:38 -0600
Subject: [PATCH] Un-inline LLFastTimer::NamedTimer::getCountAverage and
 LLFastTimer::NamedTimer::getCallAverage so some experimenting can be done in
 llfasttimer_class.cpp without massive recompiles.

---
 indra/llcommon/llfasttimer_class.cpp | 9 +++++++++
 indra/llcommon/llfasttimer_class.h   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp
index 2d1297344..e672099fc 100644
--- a/indra/llcommon/llfasttimer_class.cpp
+++ b/indra/llcommon/llfasttimer_class.cpp
@@ -498,6 +498,15 @@ void LLFastTimer::NamedTimer::accumulateTimings()
 	}
 }
 
+U32 LLFastTimer::NamedTimer::getCountAverage() const 
+{
+	return mCountAverage;// (sCurFrameIndex <= 0 || mCountAverage <= 0)  ? 0 : mCountAverage / llmin(sCurFrameIndex,(S32)HISTORY_NUM);
+}
+U32 LLFastTimer::NamedTimer::getCallAverage() const 
+{ 
+	return mCallAverage;// (sCurFrameIndex <= 0 || mCallAverage <= 0)  ? 0 : mCallAverage / llmin(sCurFrameIndex,(S32)HISTORY_NUM);
+}
+
 // static
 void LLFastTimer::NamedTimer::resetFrame()
 {
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h
index 9e7fdaec6..536de6c0d 100644
--- a/indra/llcommon/llfasttimer_class.h
+++ b/indra/llcommon/llfasttimer_class.h
@@ -82,8 +82,8 @@ public:
 		void setCollapsed(bool collapsed) { mCollapsed = collapsed; }
 		bool getCollapsed() const { return mCollapsed; }
 
-		U32 getCountAverage() const { return mCountAverage; }
-		U32 getCallAverage() const { return mCallAverage; }
+		U32 getCountAverage() const; //{ return mCountAverage }
+		U32 getCallAverage() const; //{ return mCallAverage }
 
 		U32 getHistoricalCount(S32 history_index = 0) const;
 		U32 getHistoricalCalls(S32 history_index = 0) const;