1 files changed, 16 insertions, 4 deletions

diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 72d1494..dade65f 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -102,10 +102,13 @@ LLViewerCamera::LLViewerCamera() : LLCamera()
 {
         calcProjection(getFar());
         mCameraFOVDefault = DEFAULT_FIELD_OF_VIEW;
+        mCosHalfCameraFOV = cosf(mCameraFOVDefault * 0.5f);
         mPixelMeterRatio = 0.f;
         mScreenPixelArea = 0;
         mZoomFactor = 1.f;
         mZoomSubregion = 1;
+        mAverageSpeed = 0.f;
+        mAverageAngularSpeed = 0.f;
 }
 
 void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
@@ -144,15 +147,22 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
 
         setOriginAndLookAt(origin, up_direction, point_of_interest);
 
-        F32 dpos = (center - last_position).magVec();
+        mVelocityDir = center - last_position ; 
+        F32 dpos = mVelocityDir.normVec() ;
         LLQuaternion rotation;
         rotation.shortestArc(last_axis, getAtAxis());
 
         F32 x, y, z;
         F32 drot;
         rotation.getAngleAxis(&drot, &x, &y, &z);
+
         mVelocityStat.addValue(dpos);
         mAngularVelocityStat.addValue(drot);
+        
+        mAverageSpeed = mVelocityStat.getMeanPerSec() ;
+        mAverageAngularSpeed = mAngularVelocityStat.getMeanPerSec() ;
+        mCosHalfCameraFOV = cosf(0.5f * getView() * llmax(1.0f, getAspect()));
+
         // update pixel meter ratio using default fov, not modified one
         mPixelMeterRatio = getViewHeightInPixels()/ (2.f*tanf(mCameraFOVDefault*0.5));
         // update screen pixel area
@@ -759,8 +769,8 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
 
                         BOOL in_frustum = pointInFrustum(LLVector3(vec)) > 0;
 
-                        if ( !in_frustum && all_verts ||
-                                 in_frustum && !all_verts)
+                        if (( !in_frustum && all_verts) ||
+                                 (in_frustum && !all_verts))
                         {
                                 return !all_verts;
                         }
@@ -797,9 +807,11 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
         LLCamera::setView(vertical_fov_rads); // call base implementation
 }
 
-void LLViewerCamera::setDefaultFOV(F32 vertical_fov_rads) {
+void LLViewerCamera::setDefaultFOV(F32 vertical_fov_rads) 
+{
         vertical_fov_rads = llclamp(vertical_fov_rads, getMinView(), getMaxView());
         setView(vertical_fov_rads);
         mCameraFOVDefault = vertical_fov_rads; 
+        mCosHalfCameraFOV = cosf(mCameraFOVDefault * 0.5f);
 }