diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-24 06:22:00 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-24 06:22:00 -0700 |
| commit | 89ff83d2e7aa6f5af27c3e235b467e5fcd2937a4 (patch) | |
| tree | f9ff83c4e4654876fe75459b6c92be54b134fe0a /indra/newview/llmorphview.h | |
| parent | 70cf100f747dd3511c5e1dda668ddb97487b98ab (diff) | |
| parent | f0318bf68ef01fcf011da97073b75c3ddc29414d (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llmorphview.h')
| -rw-r--r-- | indra/newview/llmorphview.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llmorphview.h b/indra/newview/llmorphview.h index 493f906c6b..f0f04dfda3 100644 --- a/indra/newview/llmorphview.h +++ b/indra/newview/llmorphview.h @@ -53,7 +53,6 @@ public: }; LLMorphView(const LLMorphView::Params&); - void initialize(); void shutdown(); // inherited methods @@ -64,12 +63,13 @@ public: void setCameraOffset(const LLVector3d& camera_offset) {mCameraOffset = camera_offset;} void setCameraTargetOffset(const LLVector3d& camera_target_offset) {mCameraTargetOffset = camera_target_offset;} - void setCameraDistToDefault() { mCameraDist = -1.f; } void updateCamera(); void setCameraDrivenByKeys( BOOL b ); protected: + void initialize(); + LLJoint* mCameraTargetJoint; LLVector3d mCameraOffset; LLVector3d mCameraTargetOffset; @@ -82,9 +82,6 @@ protected: F32 mCameraPitch; F32 mCameraYaw; - // camera zoom - F32 mCameraDist; - BOOL mCameraDrivenByKeys; }; |