diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 15:06:48 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 15:06:48 -0400 |
| commit | 504cf0870d964de5b286621a44098af6afdf13cd (patch) | |
| tree | a9faa28bec2c8d8964725e593a365de88d87e5d1 /indra/newview/llagentcamera.h | |
| parent | cc4a9b5640f4295c8af78efd4271a251434e39c6 (diff) | |
EXT-2959 : Pull out camera functions from llagent to llagentcamera
#3 checkin.
Took out llagent "friend llagentcamera" and added accessors instead.
Did some superficial formatting cleanup.
Diffstat (limited to 'indra/newview/llagentcamera.h')
| -rw-r--r-- | indra/newview/llagentcamera.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 0b55b917d0..f45cf1f5bb 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -94,11 +94,6 @@ class LLAgentCamera public: friend class LLAgent; -/******************************************************************************** - ** ** - ** INITIALIZATION - **/ - //-------------------------------------------------------------------- // Constructors / Destructors //-------------------------------------------------------------------- @@ -107,9 +102,11 @@ public: virtual ~LLAgentCamera(); void init(); void cleanup(); + void setCameraAvatarObject(LLVOAvatarSelf* avatar); private: BOOL mInitialized; + //-------------------------------------------------------------------- // Mode //-------------------------------------------------------------------- @@ -148,7 +145,6 @@ private: /** Initial focus offsets */ std::map<ECameraPreset, LLVector3d> mFocusOffsetInitial; - //-------------------------------------------------------------------- // Position //-------------------------------------------------------------------- @@ -291,6 +287,7 @@ public: void updateLookAt(const S32 mouse_x, const S32 mouse_y); BOOL setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero); ELookAtType getLookAtType(); + void lookAtLastChat(); void slamLookAt(const LLVector3 &look_at); // Set the physics data BOOL setPointAt(EPointAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero); EPointAtType getPointAtType(); |