diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:03:21 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:03:21 -0800 |
| commit | a4f121f065c580ac34e8caa666855c95eb29138b (patch) | |
| tree | 2e9d9766c99cb7bd81aa4ad7e4af1149cfa03de6 /indra/newview/llagent.cpp | |
| parent | 88f139594bb819bc31b438edcceaf9cd661b3f82 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
Pull merge from lindenlab/viewer-release
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 49f77e6c34..79da9e5873 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1092,10 +1092,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(); } |