diff options
| -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 3b83811c78..4247c84a3a 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1090,11 +1090,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();  } | 
