diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-21 14:08:38 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 14:08:38 -0500 |
| commit | 45bc601563337b99ca3dc0d733196d7a00dd54d7 (patch) | |
| tree | 2d49bf2ce2589947d1b80770f5fa7a312a1f908b /indra/newview/llagent.cpp | |
| parent | 4f2a7167b6d6b3b278b39ea7b97beb89f6abb5ee (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge changes for 3.6.11-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 325707bbf1..79da9e5873 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1099,9 +1099,9 @@ const LLVector3 &LLAgent::getPositionAgent() mFrameAgent.setOrigin(gAgentAvatarp->getPositionAgent()); } else - { - mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); - } + { + mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); + } } |