diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-16 13:55:51 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-16 13:55:51 -0800 |
commit | f1da0a4ff4e6de98422f0b4534034120bec558b7 (patch) | |
tree | 6ed802fc19200d52d9ad9ee5a57971007054480d /indra/newview/llmanip.cpp | |
parent | fc6b3d4caadf2dfe11504a0d3fa2a96f6135320b (diff) |
EXT-1478 Tool-tip background and border colors are being ignored - hooked up xml
EXT-2237 Preferences > Alerts shows "$ignoretext" in the list
EXT-1582 The current edit coordinates are displaced from their background
EXT-1466 Change Mouselook text "Press ESC to return to World View" to match stylesheet
reviewed by James
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(); { |