diff options
| author | andreylproductengine <andreylproductengine@lindenlab.com> | 2014-04-29 06:36:23 +0300 |
|---|---|---|
| committer | andreylproductengine <andreylproductengine@lindenlab.com> | 2014-04-29 06:36:23 +0300 |
| commit | c283a94c0addc47468291c5b01c74d14daf81210 (patch) | |
| tree | 852cccb53db0adc1f4e4aa248bf507f717988d06 /indra/newview | |
| parent | cd7e7e96030c2dffccc31e1c1e29f5ee608992e5 (diff) | |
MAINT-3969 FIXED Animation problems when teleporting while sitting on some objects
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 0582916362..1cc9b6a510 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3822,6 +3822,12 @@ bool LLAgent::teleportCore(bool is_local) return false; } + // force stand up and stop a sitting animation (if any), see MAINT-3969 + if (isAgentAvatarValid() && gAgentAvatarp->getParent() && gAgentAvatarp->isSitting()) + { + gAgentAvatarp->getOffObject(); + } + #if 0 // This should not exist. It has been added, removed, added, and now removed again. // This change needs to come from the simulator. Otherwise, the agent ends up out of |