diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:36:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:36:27 -0500 |
| commit | afbc78d0398d58c44b2b1fb692ce1a27577fc4b1 (patch) | |
| tree | da4c6c1bd6e87b81b10a5b7bed6429373e6a89eb /indra/newview/llmanip.cpp | |
| parent | 6cea252986ef6d33f2e37333a286362b8e0272c5 (diff) | |
| parent | 3e46ee6274d04d91657da92953b167fe94eb7f59 (diff) | |
Merging viewer-2-0 changes into avatar-pipeline branch
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llmanip.cpp')
| -rw-r--r-- | indra/newview/llmanip.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index 9ca207a579..f30821cacf 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -265,8 +265,8 @@ BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVect if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD) { BOOL result = FALSE; - F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidthScaled() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.mHUDCurZoom; - F32 mouse_y = ((F32)y / gViewerWindow->getWindowHeightScaled() - 0.5f) / gAgent.mHUDCurZoom; + F32 mouse_x = ((F32)x / gViewerWindow->getWorldViewWidthScaled() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.mHUDCurZoom; + F32 mouse_y = ((F32)y / gViewerWindow->getWorldViewHeightScaled() - 0.5f) / gAgent.mHUDCurZoom; LLVector3 origin_agent = gAgent.getPosAgentFromGlobal(origin); LLVector3 mouse_pos = LLVector3(0.f, -mouse_x, mouse_y); |