diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
| commit | 197db4976ad8df958b7b2c59a66498398cfd0665 (patch) | |
| tree | 21cdd341fbb8adb1b208142fc4e63362090931da /indra/newview/llagent.cpp | |
| parent | a4173dc81a21dfac6a8b57e8e1c354b9a37fe5ba (diff) | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
merge changes for 3.6.13-release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index d210456993..0a63358de2 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1100,9 +1100,9 @@ const LLVector3 &LLAgent::getPositionAgent() mFrameAgent.setOrigin(gAgentAvatarp->getPositionAgent()); } else - { - mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); - } + { + mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); + } } |