clamp cursor mode to Window, not WorldView

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b157fefb01..e31c7495ca 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3560,11 +3560,11 @@ void LLViewerWindow::moveCursorToCenter()
 
 void LLViewerWindow::moveCursorTo(S32 x, S32 y)
 {
-    // Clamp to the world view so a gamepad-driven cursor (see
-    // LLAgent::applyExternalActions()'s CONTROL_MODE_CURSOR handling) can't warp
-    // itself off-screen.
-    x = llclamp(x, 0, getWorldViewWidthScaled());
-    y = llclamp(y, 0, getWorldViewHeightScaled());
+    // Clamp to the whole window (not just the world view) so a gamepad-driven
+    // cursor (see LLAgent::applyExternalActions()'s CONTROL_MODE_CURSOR
+    // handling) can reach the menu bar and toolbars, but not escape the window.
+    x = llclamp(x, 0, getWindowWidthScaled());
+    y = llclamp(y, 0, getWindowHeightScaled());
 
     LLUI::getInstance()->setMousePositionScreen(x, y);