diff options
author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/newview/llmorphview.cpp | |
parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/newview/llmorphview.cpp')
-rwxr-xr-x | indra/newview/llmorphview.cpp | 9 |
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() //----------------------------------------------------------------------------- |