SH-3405 FIX convert existing stats to lltrace system

final removal of remaining LLStat code

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
index b857c7fe89..399eed7695 100644
--- a/indra/newview/llviewercamera.h
+++ b/indra/newview/llviewercamera.h
@@ -29,10 +29,10 @@
 
 #include "llcamera.h"
 #include "llsingleton.h"
-#include "llstat.h"
 #include "lltimer.h"
 #include "m4math.h"
 #include "llcoord.h"
+#include "lltrace.h"
 
 class LLViewerObject;
 
@@ -100,12 +100,12 @@ public:
 	BOOL projectPosAgentToScreen(const LLVector3 &pos_agent, LLCoordGL &out_point, const BOOL clamp = TRUE) const;
 	BOOL projectPosAgentToScreenEdge(const LLVector3 &pos_agent, LLCoordGL &out_point) const;
 
-	const LLVector3* getVelocityDir() const {return &mVelocityDir;}
-	LLStat *getVelocityStat() { return &mVelocityStat; }
-	LLStat *getAngularVelocityStat() { return &mAngularVelocityStat; }
-	F32     getCosHalfFov() {return mCosHalfCameraFOV;}
-	F32     getAverageSpeed() {return mAverageSpeed ;}
-	F32     getAverageAngularSpeed() {return mAverageAngularSpeed;}
+	const LLVector3*         getVelocityDir() const    {return &mVelocityDir;}
+	static LLTrace::Count<>* getVelocityStat()		   {return &sVelocityStat; }
+	static LLTrace::Count<>* getAngularVelocityStat()  {return &sAngularVelocityStat; }
+	F32                      getCosHalfFov()           {return mCosHalfCameraFOV;}
+	F32                      getAverageSpeed()         {return mAverageSpeed ;}
+	F32                      getAverageAngularSpeed()  {return mAverageAngularSpeed;}
 
 	void getPixelVectors(const LLVector3 &pos_agent, LLVector3 &up, LLVector3 &right);
 	LLVector3 roundToPixel(const LLVector3 &pos_agent);
@@ -117,9 +117,9 @@ public:
 	F32 getDefaultFOV() { return mCameraFOVDefault; }
 
 	BOOL cameraUnderWater() const;
-
-	const LLVector3 &getPointOfInterest() { return mLastPointOfInterest; }
 	BOOL areVertsVisible(LLViewerObject* volumep, BOOL all_verts);
+
+	const LLVector3 &getPointOfInterest()		{ return mLastPointOfInterest; }
 	F32 getPixelMeterRatio() const				{ return mPixelMeterRatio; }
 	S32 getScreenPixelArea() const				{ return mScreenPixelArea; }
 
@@ -130,12 +130,12 @@ public:
 protected:
 	void calcProjection(const F32 far_distance) const;
 
-	LLStat mVelocityStat;
-	LLStat mAngularVelocityStat;
-	LLVector3 mVelocityDir ;
-	F32       mAverageSpeed ;
-	F32       mAverageAngularSpeed ;
+	static LLTrace::Count<> sVelocityStat;
+	static LLTrace::Count<> sAngularVelocityStat;
 
+	LLVector3			mVelocityDir ;
+	F32					mAverageSpeed ;
+	F32					mAverageAngularSpeed ;
 	mutable LLMatrix4	mProjectionMatrix;	// Cache of perspective matrix
 	mutable LLMatrix4	mModelviewMatrix;
 	F32					mCameraFOVDefault;