diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-12-05 15:26:38 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-12-05 15:26:38 -0500 |
| commit | da135de77dea24427f5e658ebac43b77c215cc9b (patch) | |
| tree | b6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/newview/llagent.cpp | |
| parent | b2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff) | |
| parent | fc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff) | |
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
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()); + } } |