diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
commit | bad06f68fc3122b5b83f21f1fa8bc7e7ec53bfc8 (patch) | |
tree | cdf1bdc9f6c665eba22645ce4a1fdf7c34d55321 /indra/newview/llmaniprotate.cpp | |
parent | 211d1dfb770aa029d77cd231815a5848640b54a6 (diff) | |
parent | af8c2bc94868e056908b4ae2fc285925cd68b56b (diff) |
Merge. Refresh from viewer-release merged with in-progress work.
Diffstat (limited to 'indra/newview/llmaniprotate.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llmaniprotate.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index 826e8d560a..d79f1040bb 100644..100755 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -1689,7 +1689,6 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y ) return; } - LLQuaternion object_rot = first_object->getRenderRotation(); LLVector3 rotation_center = gAgent.getPosAgentFromGlobal(mRotationCenter); LLVector3 mouse_dir_x; LLVector3 mouse_dir_y; |