Second Life viewer sources 1.23.0-RC

1 files changed, 4 insertions, 9 deletions

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 34e62c8..2c2c1c2 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -187,7 +188,7 @@ LLButton::LLButton(const std::string& name, const LLRect& rect,
 
 void LLButton::init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name)
 {
-        mGLFont = ( font ? font : LLFontGL::sSansSerif);
+        mGLFont = ( font ? font : LLFontGL::getFontSansSerif());
 
         // Hack to make sure there is space for at least one character
         if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" ")))
@@ -422,13 +423,7 @@ void LLButton::draw()
         // Unselected image assignments
         S32 local_mouse_x;
         S32 local_mouse_y;
-        LLCoordWindow cursor_pos_window;
-        getWindow()->getCursorPosition(&cursor_pos_window);
-        LLCoordGL cursor_pos_gl;
-        getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
-        cursor_pos_gl.mX = llround((F32)cursor_pos_gl.mX / LLUI::sGLScaleFactor.mV[VX]);
-        cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
-        screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
+        LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
 
         BOOL pressed = pressed_by_keyboard 
                                         || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y))