Backported 1.23's minimap conversion to XUI

2 files changed, 13 insertions, 0 deletions

diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index f3e73fd..8a7b80e 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -1645,6 +1645,18 @@ void LLUI::setCursorPositionLocal(const LLView* viewp, S32 x, S32 y)
         setCursorPositionScreen(screen_x, screen_y);
 }
 
+//static 
+void LLUI::getCursorPositionLocal(const LLView* viewp, S32 *x, S32 *y)
+{
+        LLCoordWindow cursor_pos_window;
+        LLView::getWindow()->getCursorPosition(&cursor_pos_window);
+        LLCoordGL cursor_pos_gl;
+        LLView::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]);
+        viewp->screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, x, y);
+}
+
 // On Windows, the user typically sets the language when they install the
 // app (by running it with a shortcut that sets InstallLanguage).  On Mac,
 // or on Windows if the SecondLife.exe executable is run directly, the 
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 1e731f1..b51b132 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -175,6 +175,7 @@ public:
         static std::string locateSkin(const std::string& filename);
         static void setCursorPositionScreen(S32 x, S32 y);
         static void setCursorPositionLocal(const LLView* viewp, S32 x, S32 y);
+        static void getCursorPositionLocal(const LLView* viewp, S32 *x, S32 *y);
         static void setScaleFactor(const LLVector2& scale_factor);
         static void setLineWidth(F32 width);
         static LLUIImage* getUIImage(const std::string& name);