summaryrefslogtreecommitdiff
path: root/indra/newview/llmorphview.h
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-06-23 16:50:06 -0700
committerRichard Nelson <none@none>2010-06-23 16:50:06 -0700
commit0aabcc81346390fe312bf03355744a6e13ab0927 (patch)
tree0e1baa5ed6a7c0702837fd96aa305ab6428699db /indra/newview/llmorphview.h
parentaf914e4ab666aad041aa17f6459d1ff834440b44 (diff)
EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
Diffstat (limited to 'indra/newview/llmorphview.h')
-rw-r--r--indra/newview/llmorphview.h7
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;
};