summaryrefslogtreecommitdiff
path: root/indra/newview/llmorphview.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-11-14 08:49:08 -0500
committerNat Goodspeed <nat@lindenlab.com>2014-11-14 08:49:08 -0500
commit6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch)
tree86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/newview/llmorphview.cpp
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
parent316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llmorphview.cpp')
-rwxr-xr-xindra/newview/llmorphview.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index 252d1b78ea..ff86400a56 100755
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -47,17 +47,8 @@
LLMorphView *gMorphView = NULL;
-
-const F32 EDIT_AVATAR_ORBIT_SPEED = 0.1f;
-const F32 EDIT_AVATAR_MAX_CAMERA_PITCH = 0.5f;
-
-const F32 CAMERA_MOVE_TIME = 0.5f;
const F32 MORPH_NEAR_CLIP = 0.1f;
-const F32 CAMERA_DIST_MIN = 0.4f;
-const F32 CAMERA_DIST_MAX = 4.0f;
-const F32 CAMERA_DIST_STEP = 1.5f;
-
//-----------------------------------------------------------------------------
// LLMorphView()
//-----------------------------------------------------------------------------