summaryrefslogtreecommitdiff
path: root/indra/newview/llmanip.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-01-23 19:12:31 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-01-23 19:12:31 +0000
commit7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch)
tree99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/newview/llmanip.cpp
parent47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff)
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llmanip.cpp')
-rw-r--r--indra/newview/llmanip.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index 57d34f672b..74c7ae6c18 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -88,9 +88,7 @@ void LLManip::getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3
LLVector3 arrow_axis;
getManipAxis(object, manip, arrow_axis);
- LLVector3 origin_dir = grid_origin - gCamera->getOrigin();
- origin_dir.normVec();
- LLVector3 cross = arrow_axis % origin_dir;
+ LLVector3 cross = arrow_axis % gCamera->getAtAxis();
normal = cross % arrow_axis;
normal.normVec();
}