diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:24:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:24:15 -0400 |
| commit | a32daa0c10b285354e94e0e8bf0cc6c5ffce09a5 (patch) | |
| tree | c2ba5f181935b95d2f23406c41917401cd4be963 /indra/newview/llviewermessage.cpp | |
| parent | 929bde3ed08f9a1d2a8f4c9821b0d51c11d895e9 (diff) | |
| parent | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (diff) | |
merge changes for vwr-25126
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index cfffc6ecc9..3f018fc57c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -122,6 +122,7 @@ // const F32 BIRD_AUDIBLE_RADIUS = 32.0f; const F32 SIT_DISTANCE_FROM_TARGET = 0.25f; +const F32 CAMERA_POSITION_THRESHOLD_SQUARED = 0.001f * 0.001f; static const F32 LOGOUT_REPLY_TIME = 3.f; // Wait this long after LogoutReply before quitting. // Determine how quickly residents' scripts can issue question dialogs @@ -4745,7 +4746,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data) BOOL force_mouselook; mesgsys->getBOOLFast(_PREHASH_SitTransform, _PREHASH_ForceMouselook, force_mouselook); - if (isAgentAvatarValid() && dist_vec_squared(camera_eye, camera_at) > 0.0001f) + if (isAgentAvatarValid() && dist_vec_squared(camera_eye, camera_at) > CAMERA_POSITION_THRESHOLD_SQUARED) { gAgentCamera.setSitCamera(sitObjectID, camera_eye, camera_at); } |