Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 1 insertions, 9 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 325707bbf1..9cee0aa867 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1092,18 +1092,10 @@ const LLVector3d &LLAgent::getPositionGlobal() const
 //-----------------------------------------------------------------------------
 const LLVector3 &LLAgent::getPositionAgent()
 {
-	if (isAgentAvatarValid())
-	{
-		if(gAgentAvatarp->mDrawable.isNull())
-		{
-			mFrameAgent.setOrigin(gAgentAvatarp->getPositionAgent());
-		}
-		else
+	if (isAgentAvatarValid() && !gAgentAvatarp->mDrawable.isNull())
 		{
 			mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition());
 		}
-	}
-
 
 	return mFrameAgent.getOrigin();
 }