diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
| commit | 6d24bb6eab5e62af8909ea9659517a82ca21513b (patch) | |
| tree | 7630f299e9a707df4bad803c0e3e37d00c4658bc /indra/newview/llagent.cpp | |
| parent | 22a3b0bd7baf132a90ddf02d5eb965b71451b757 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Pull merge from lindenlab/viewer-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()); + } } |