diff options
| author | simon <none@none> | 2013-12-09 16:11:09 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-12-09 16:11:09 -0800 |
| commit | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch) | |
| tree | 269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/newview/llagent.cpp | |
| parent | 1a456c2e41905e93e393dc2dda0d143ee7611275 (diff) | |
| parent | 4a09065691b6a3461ff2f4541abb3accade207fe (diff) | |
Merge in downstream code for 3.6.13
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()); + } } |