diff options
author | James Cook <james@lindenlab.com> | 2009-11-16 21:49:46 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-16 21:49:46 -0800 |
commit | 2852fce2de898f5999bfaaf939637f06f5b2112d (patch) | |
tree | 0bf1e86941c1776e37680ca1231a7b5b975f2523 /indra/newview/llmanip.cpp | |
parent | 18980efe16e19ab0562267e10ec55bed55b581fb (diff) | |
parent | a97941369ddde6a548e91576655d5f52942d085e (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llmanip.cpp')
-rw-r--r-- | indra/newview/llmanip.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index fa1dbe0603..9ca207a579 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -429,9 +429,10 @@ void LLManip::renderXYZ(const LLVector3 &vec) const S32 PAD = 10; std::string feedback_string; LLVector3 camera_pos = LLViewerCamera::getInstance()->getOrigin() + LLViewerCamera::getInstance()->getAtAxis(); - S32 vertical_offset = gViewerWindow->getWindowHeightScaled() / 2 - VERTICAL_OFFSET; - S32 window_center_x = gViewerWindow->getWindowWidthScaled() / 2; - S32 window_center_y = gViewerWindow->getWindowHeightScaled() / 2; + S32 window_center_x = gViewerWindow->getWorldViewRectScaled().getWidth() / 2; + S32 window_center_y = gViewerWindow->getWorldViewRectScaled().getHeight() / 2; + S32 vertical_offset = window_center_y - VERTICAL_OFFSET; + glPushMatrix(); { |