diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
| commit | 69c32b04cfd52c6fbd34997fa6485a84435743ef (patch) | |
| tree | 9e95073f5d7109b86ed5fdb06b26dae4416c7146 /indra/newview/llagent.cpp | |
| parent | dc2af90b04a16a41851874b9ab55b4ac61af2d7b (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-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 14a2508697..f150ceda67 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1118,9 +1118,9 @@ const LLVector3 &LLAgent::getPositionAgent() mFrameAgent.setOrigin(gAgentAvatarp->getPositionAgent()); } else - { - mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); - } + { + mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); + } } |