diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
| commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
| tree | 214b852c8451409d5d355437ddad48199bef976a /indra/newview/llagent.cpp | |
| parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
Merge with viewer-bear
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 49f77e6c34..325707bbf1 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1092,11 +1092,19 @@ const LLVector3d &LLAgent::getPositionGlobal() const //----------------------------------------------------------------------------- const LLVector3 &LLAgent::getPositionAgent() { - if (isAgentAvatarValid() && !gAgentAvatarp->mDrawable.isNull()) + if (isAgentAvatarValid()) { - mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); + if(gAgentAvatarp->mDrawable.isNull()) + { + mFrameAgent.setOrigin(gAgentAvatarp->getPositionAgent()); + } + else + { + mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); + } } + return mFrameAgent.getOrigin(); } |