diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 11:57:35 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 11:57:35 -0400 |
| commit | 00ad0c425398dd748f4759243dc789199a73e87d (patch) | |
| tree | 801ab4805be44117bda3a6d35e18161cc3ccd1c5 /indra/newview/llagent.cpp | |
| parent | e677e5e77114cfbfcd7c5e838922fdf8d12853fb (diff) | |
| parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) | |
merge up to latest viewer-development with mesh changes
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 8f5efcf941..08d71fc8fc 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1224,7 +1224,13 @@ BOOL LLAgent::getBusy() const //----------------------------------------------------------------------------- // startAutoPilotGlobal() //----------------------------------------------------------------------------- -void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::string& behavior_name, const LLQuaternion *target_rotation, void (*finish_callback)(BOOL, void *), void *callback_data, F32 stop_distance, F32 rot_threshold) +void LLAgent::startAutoPilotGlobal( + const LLVector3d &target_global, + const std::string& behavior_name, + const LLQuaternion *target_rotation, + void (*finish_callback)(BOOL, void *), + void *callback_data, + F32 stop_distance, F32 rot_threshold) { if (!isAgentAvatarValid()) { @@ -1255,7 +1261,7 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s else { // Guess at a reasonable stop distance. - mAutoPilotStopDistance = fsqrtf( distance ); + mAutoPilotStopDistance = (F32) sqrt( distance ); if (mAutoPilotStopDistance < 0.5f) { mAutoPilotStopDistance = 0.5f; |