diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-12-05 10:39:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-12-05 10:39:35 -0500 |
| commit | 744cf6be8d5a808020a4d6cc98ff4c6b208239c0 (patch) | |
| tree | fab4ec7a30752ef1087d15540899830bf766cb89 /indra/newview/llagent.cpp | |
| parent | 1320e5ddcd9fc3be526dcacbf4710f8bcf878665 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 06a6a10a5c..ba81f75683 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1056,10 +1056,18 @@ const LLVector3d &LLAgent::getPositionGlobal() const //----------------------------------------------------------------------------- const LLVector3 &LLAgent::getPositionAgent() { - if (isAgentAvatarValid() && !gAgentAvatarp->mDrawable.isNull()) + if (isAgentAvatarValid()) + { + if(gAgentAvatarp->mDrawable.isNull()) + { + mFrameAgent.setOrigin(gAgentAvatarp->getPositionAgent()); + } + else { mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); } + } + return mFrameAgent.getOrigin(); } |