diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
| commit | 8c344f4da02105428c5933501d028a4a8908a657 (patch) | |
| tree | 1463f67247c48a7420620917aa7fde5d6a810820 /indra/newview/llmanip.cpp | |
| parent | 8534623734e64387736ddb76683939104d796ade (diff) | |
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llmanip.cpp')
| -rw-r--r-- | indra/newview/llmanip.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index 74c7ae6c18..57d34f672b 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -88,7 +88,9 @@ void LLManip::getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3 LLVector3 arrow_axis; getManipAxis(object, manip, arrow_axis); - LLVector3 cross = arrow_axis % gCamera->getAtAxis(); + LLVector3 origin_dir = grid_origin - gCamera->getOrigin(); + origin_dir.normVec(); + LLVector3 cross = arrow_axis % origin_dir; normal = cross % arrow_axis; normal.normVec(); } |