diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-24 16:12:01 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-24 16:12:01 -0400 |
| commit | cc4a9b5640f4295c8af78efd4271a251434e39c6 (patch) | |
| tree | e97f86a6968415e16f6e0d5a5a907830b9529f22 /indra/newview/llagentcamera.h | |
| parent | fc49539b36adfd4c87d7824db5d94a7858683f3d (diff) | |
EXT-2959 : Pull out camera functions from llagent to llagentcamera
#2 checkin.
Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
Diffstat (limited to 'indra/newview/llagentcamera.h')
| -rw-r--r-- | indra/newview/llagentcamera.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 6a0e8d372e..0b55b917d0 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -99,10 +99,6 @@ public: ** INITIALIZATION **/ - // SERAPH UNFILED -public: - F32 mDrawDistance; - //-------------------------------------------------------------------- // Constructors / Destructors //-------------------------------------------------------------------- @@ -139,9 +135,7 @@ private: //-------------------------------------------------------------------- public: void switchCameraPreset(ECameraPreset preset); - private: - /** Determines default camera offset depending on the current camera preset */ LLVector3 getCameraOffsetInitial(); @@ -251,7 +245,7 @@ public: void startCameraAnimation(); void stopCameraAnimation(); private: - LLFrameTimer mAnimationTimer; // Seconds that transition animation has been active // SERAPH agentCamera + LLFrameTimer mAnimationTimer; // Seconds that transition animation has been active F32 mAnimationDuration; // In seconds BOOL mCameraAnimating; // Camera is transitioning from one mode to another LLVector3d mAnimationCameraStartGlobal; // Camera start position, global coords @@ -347,6 +341,8 @@ public: void resetView(BOOL reset_camera = TRUE, BOOL change_camera = FALSE); // Called on camera movement. Unlocks camera from the default position behind the avatar. void unlockView(); +public: + F32 mDrawDistance; //-------------------------------------------------------------------- // Mouselook |