diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
| commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
| tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/newview/llagent.cpp | |
| parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Merge with 3.6.11
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()); + } } |