From 85810c690d7c2e27064a889b82bcba3d39c12873 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 31 Oct 2020 16:39:25 -0400
Subject: [PATCH] Ungodly super spammy mutex locks in input and hover
---
indra/llui/llbutton.cpp | 2 ++
indra/llui/lldraghandle.cpp | 4 ++++
indra/llui/lllineeditor.cpp | 6 +++++-
indra/llui/llmodaldialog.cpp | 4 +++-
indra/llui/llmultislider.cpp | 4 ++++
indra/llui/llscrollbar.cpp | 8 ++++++--
indra/llui/llslider.cpp | 6 +++++-
indra/llui/lltexteditor.cpp | 4 +++-
indra/llui/lluictrl.cpp | 10 ++++++++--
indra/newview/llmanip.cpp | 4 ++++
indra/newview/llmaniprotate.cpp | 4 ++++
indra/newview/llmanipscale.cpp | 6 +++++-
indra/newview/llmaniptranslate.cpp | 12 +++++++++++-
indra/newview/lltool.cpp | 2 ++
indra/newview/lltoolbrush.cpp | 2 ++
indra/newview/lltooldraganddrop.cpp | 2 ++
indra/newview/lltoolfocus.cpp | 10 +++++++++-
indra/newview/lltoolgrab.cpp | 14 ++++++++++++--
indra/newview/lltoolgun.cpp | 4 ++++
indra/newview/lltoolpie.cpp | 10 ++++++++++
indra/newview/lltoolplacer.cpp | 4 +++-
indra/newview/lltoolselectland.cpp | 10 +++++++++-
indra/newview/llviewerkeyboard.cpp | 2 ++
23 files changed, 119 insertions(+), 15 deletions(-)
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 611e70b35fe..01aa5c79c24 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -608,7 +608,9 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
// We only handle the click if the click both started and ended within us
getWindow()->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL;
+#endif
}
return TRUE;
}
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp
index 48bf5bb80ff..3b2f5e29e33 100644
--- a/indra/llui/lldraghandle.cpp
+++ b/indra/llui/lldraghandle.cpp
@@ -365,13 +365,17 @@ BOOL LLDragHandle::handleHover(S32 x, S32 y, MASK mask)
mDragLastScreenY += delta_y;
getWindow()->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" <<LL_ENDL;
+#endif
handled = TRUE;
}
else
{
getWindow()->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#endif
handled = TRUE;
}
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index e7b4f32d14f..997dab0dceb 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -869,14 +869,18 @@ BOOL LLLineEditor::handleHover(S32 x, S32 y, MASK mask)
mKeystrokeTimer.reset();
getWindow()->setCursor(UI_CURSOR_IBEAM);
- LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#endif
handled = TRUE;
}
if( !handled )
{
getWindow()->setCursor(UI_CURSOR_IBEAM);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#endif
handled = TRUE;
}
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 208b27fd9b3..cef56377b21 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -195,7 +195,9 @@ BOOL LLModalDialog::handleHover(S32 x, S32 y, MASK mask)
if( childrenHandleHover(x, y, mask) == NULL )
{
getWindow()->setCursor(UI_CURSOR_ARROW);
- LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL;
+#endif
}
LLView* popup_menu = LLMenuGL::sMenuContainer->getVisibleMenu();
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index 604d246f12c..1ccfc065fb9 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -506,7 +506,9 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask)
onCommit();
getWindow()->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#endif
}
else
{
@@ -529,7 +531,9 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask)
}
getWindow()->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#endif
}
return TRUE;
}
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index f728d4fa1c4..260119734f1 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -381,7 +381,9 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
}
getWindow()->setCursor(UI_CURSOR_ARROW);
- LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#endif
handled = TRUE;
}
else
@@ -393,7 +395,9 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
if( !handled )
{
getWindow()->setCursor(UI_CURSOR_ARROW);
- LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#endif
handled = TRUE;
}
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index 62df5a2c385..5e8c6d9599d 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -186,12 +186,16 @@ BOOL LLSlider::handleHover(S32 x, S32 y, MASK mask)
setValueAndCommit(t * (mMaxValue - mMinValue) + mMinValue );
}
getWindow()->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#endif
}
else
{
getWindow()->setCursor(UI_CURSOR_ARROW);
- LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (inactive)" << LL_ENDL;
+#endif
}
return TRUE;
}
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index f36fc1a5778..7175e97aa96 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -802,7 +802,9 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
setCursorAtLocalPos( clamped_x, clamped_y, true );
mSelectionEnd = mCursorPos;
}
- LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by " << getName() << " (active)" << LL_ENDL;
+#endif
getWindow()->setCursor(UI_CURSOR_IBEAM);
handled = TRUE;
}
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 1d9f0b75cde..515488006a3 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -343,8 +343,9 @@ void LLUICtrl::onMouseLeave(S32 x, S32 y, MASK mask)
//virtual
BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask)
{
-
+#if SHOW_DEBUG
LL_DEBUGS() << "LLUICtrl::handleMouseDown calling LLView)'s handleMouseUp (first initialized xui to: " << getPathname() << " )" << LL_ENDL;
+#endif
BOOL handled = LLView::handleMouseDown(x,y,mask);
@@ -352,7 +353,9 @@ BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask)
{
(*mMouseDownSignal)(this,x,y,mask);
}
+#if SHOW_DEBUG
LL_DEBUGS() << "LLUICtrl::handleMousedown - handled is returning as: " << handled << " " << LL_ENDL;
+#endif
#if AL_VIEWER_EVENT_RECORDER
if (handled && LLViewerEventRecorder::getLoggingStatus()) {
@@ -365,8 +368,9 @@ BOOL LLUICtrl::handleMouseDown(S32 x, S32 y, MASK mask)
//virtual
BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask)
{
-
+#if SHOW_DEBUG
LL_DEBUGS() << "LLUICtrl::handleMouseUp calling LLView)'s handleMouseUp (first initialized xui to: " << getPathname() << " )" << LL_ENDL;
+#endif
BOOL handled = LLView::handleMouseUp(x,y,mask);
@@ -380,7 +384,9 @@ BOOL LLUICtrl::handleMouseUp(S32 x, S32 y, MASK mask)
(*mMouseUpSignal)(this,x,y,mask);
}
+#if SHOW_DEBUG
LL_DEBUGS() << "LLUICtrl::handleMouseUp - handled for xui " << getPathname() << " - is returning as: " << handled << " " << LL_ENDL;
+#endif
return handled;
}
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index 8c6ec08d660..31924269181 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -227,11 +227,15 @@ BOOL LLManip::handleHover(S32 x, S32 y, MASK mask)
setMouseCapture( FALSE );
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManip (active)" << LL_ENDL;
+#endif
}
else
{
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManip (inactive)" << LL_ENDL;
+#endif
}
gViewerWindow->setCursor(UI_CURSOR_ARROW);
return TRUE;
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index c39f57df27e..791a4483975 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -522,12 +522,16 @@ BOOL LLManipRotate::handleHover(S32 x, S32 y, MASK mask)
drag(x, y);
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipRotate (active)" << LL_ENDL;
+#endif
}
else
{
highlightManipulators(x, y);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipRotate (inactive)" << LL_ENDL;
+#endif
}
gViewerWindow->setCursor(UI_CURSOR_TOOLROTATE);
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 6ae12a1249b..777adf24dd9 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -428,7 +428,9 @@ BOOL LLManipScale::handleHover(S32 x, S32 y, MASK mask)
drag( x, y );
}
}
- LL_DEBUGS("UserInput") << "hover handled by LLManipScale (active)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLManipScale (active)" << LL_ENDL;
+#endif
}
else
{
@@ -558,7 +560,9 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
}
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipScale (inactive)" << LL_ENDL;
+#endif
}
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index e53ab91e1bf..66eed6c134a 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -413,7 +413,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
// Bail out if mouse not down.
if( !hasMouseCapture() )
{
- LL_DEBUGS("UserInput") << "hover handled by LLManipTranslate (inactive)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLManipTranslate (inactive)" << LL_ENDL;
+#endif
// Always show cursor
// gViewerWindow->setCursor(UI_CURSOR_ARROW);
gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
@@ -449,7 +451,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
// rotation above.
if( x == mLastHoverMouseX && y == mLastHoverMouseY && !rotated)
{
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipTranslate (mouse unmoved)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
return TRUE;
}
@@ -462,7 +466,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
{
if (abs(mMouseDownX - x) < MOUSE_DRAG_SLOP && abs(mMouseDownY - y) < MOUSE_DRAG_SLOP )
{
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipTranslate (mouse inside slop)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
return TRUE;
}
@@ -479,7 +485,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
// When we make the copy, we don't want to do any other processing.
// If so, the object will also be moved, and the copy will be offset.
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipTranslate (made copy)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
}
}
@@ -772,7 +780,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
gAgentCamera.clearFocusObject();
dialog_refresh_all(); // ??? is this necessary?
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLManipTranslate (active)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
return TRUE;
}
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp
index c5e31ff8e6b..3e80123de6d 100644
--- a/indra/newview/lltool.cpp
+++ b/indra/newview/lltool.cpp
@@ -103,7 +103,9 @@ BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask)
BOOL LLTool::handleHover(S32 x, S32 y, MASK mask)
{
gViewerWindow->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by a tool" << LL_ENDL;
+#endif
// by default, do nothing, say we handled it
return TRUE;
}
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp
index 2d2c069f91b..8cf83dd4200 100644
--- a/indra/newview/lltoolbrush.cpp
+++ b/indra/newview/lltoolbrush.cpp
@@ -405,9 +405,11 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLToolBrushLand::handleHover( S32 x, S32 y, MASK mask )
{
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolBrushLand ("
<< (hasMouseCapture() ? "active":"inactive")
<< ")" << LL_ENDL;
+#endif
mMouseX = x;
mMouseY = y;
mGotHover = TRUE;
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index ce323e22445..45210a91681 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -551,7 +551,9 @@ BOOL LLToolDragAndDrop::handleHover( S32 x, S32 y, MASK mask )
ECursorType cursor = acceptanceToCursor(acceptance);
gViewerWindow->getWindow()->setCursor( cursor );
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolDragAndDrop" << LL_ENDL;
+#endif
return TRUE;
}
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index 9a527c5b006..977a8027d8e 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -356,7 +356,9 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
{
if (!mValidClickPoint)
{
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [invalid point]" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_NO);
gViewerWindow->showCursor();
return TRUE;
@@ -383,7 +385,9 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->moveCursorToCenter();
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [active]" << LL_ENDL;
+#endif
}
else if ( gCameraBtnPan ||
mask == MASK_PAN ||
@@ -411,7 +415,9 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->moveCursorToCenter();
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolPan" << LL_ENDL;
+#endif
}
else if (gCameraBtnZoom)
{
@@ -443,7 +449,9 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->moveCursorToCenter();
}
- LL_DEBUGS("UserInput") << "hover handled by LLToolZoom" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLToolZoom" << LL_ENDL;
+#endif
}
}
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index f4c82aee094..732cd29a8d3 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -762,7 +762,9 @@ void LLToolGrabBase::handleHoverActive(S32 x, S32 y, MASK mask)
// HACK to avoid assert: error checking system makes sure that the cursor is set during every handleHover. This is actually a no-op since the cursor is hidden.
gViewerWindow->setCursor(UI_CURSOR_ARROW);
- LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (active) [cursor hidden]" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (active) [cursor hidden]" << LL_ENDL;
+#endif
}
@@ -927,7 +929,9 @@ void LLToolGrabBase::handleHoverNonPhysical(S32 x, S32 y, MASK mask)
void LLToolGrabBase::handleHoverInactive(S32 x, S32 y, MASK mask)
{
// JC - TODO - change cursor based on gGrabBtnVertical, gGrabBtnSpin
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (inactive-not over editable object)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB);
}
@@ -937,7 +941,9 @@ void LLToolGrabBase::handleHoverFailed(S32 x, S32 y, MASK mask)
if( GRAB_NOOBJECT == mMode )
{
gViewerWindow->setCursor(UI_CURSOR_NO);
- LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (not on object)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (not on object)" << LL_ENDL;
+#endif
}
else
{
@@ -950,7 +956,9 @@ void LLToolGrabBase::handleHoverFailed(S32 x, S32 y, MASK mask)
{
case GRAB_LOCKED:
gViewerWindow->setCursor(UI_CURSOR_GRABLOCKED);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (grab failed, no move permission)" << LL_ENDL;
+#endif
break;
// Non physical now handled by handleHoverActive - CRO
@@ -965,7 +973,9 @@ void LLToolGrabBase::handleHoverFailed(S32 x, S32 y, MASK mask)
else
{
gViewerWindow->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolGrab (grab failed but within slop)" << LL_ENDL;
+#endif
}
}
}
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
index 9af0588c096..fd030b8b902 100644
--- a/indra/newview/lltoolgun.cpp
+++ b/indra/newview/lltoolgun.cpp
@@ -143,12 +143,16 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->hideCursor();
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolGun (mouselook)" << LL_ENDL;
+#endif
}
+#if SHOW_DEBUG
else
{
LL_DEBUGS("UserInput") << "hover handled by LLToolGun (not mouselook)" << LL_ENDL;
}
+#endif
// HACK to avoid assert: error checking system makes sure that the cursor is set during every handleHover. This is actually a no-op since the cursor is hidden.
gViewerWindow->setCursor(UI_CURSOR_ARROW);
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 1c1ec8af35a..60f5c87f497 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -710,7 +710,9 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
// could disable it here.
show_highlight = true;
// cursor set by media object
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
+#endif
}
else if (!mMouseOutsideSlop
&& mMouseButtonDown
@@ -748,7 +750,9 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
show_highlight = true;
ECursorType cursor = cursorFromObject(click_action_object);
gViewerWindow->setCursor(cursor);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
+#endif
}
// [RLVa:KB] - Checked: RLVa-1.1.0
else if ( (object) && (RlvActions::isRlvEnabled()) && (!RlvActions::canTouch(object, mHoverPick.mObjectOffset)) )
@@ -762,19 +766,25 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
{
show_highlight = true;
gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
+#endif
}
else if ((!object || !object->isAttachment() || object->getClickAction() != CLICK_ACTION_DISABLED)
&& ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch())))
{
show_highlight = true;
gViewerWindow->setCursor(UI_CURSOR_HAND);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
+#endif
}
else
{
gViewerWindow->setCursor(UI_CURSOR_ARROW);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL;
+#endif
}
}
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index f9c91d7d820..34d33743b94 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -545,7 +545,9 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
BOOL LLToolPlacer::handleHover(S32 x, S32 y, MASK mask)
{
- LL_DEBUGS("UserInput") << "hover handled by LLToolPlacer" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLToolPlacer" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_TOOLCREATE);
return TRUE;
}
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
index ff991dc9fd6..a918905ac27 100644
--- a/indra/newview/lltoolselectland.cpp
+++ b/indra/newview/lltoolselectland.cpp
@@ -168,13 +168,17 @@ BOOL LLToolSelectLand::handleHover(S32 x, S32 y, MASK mask)
roundXY(mWestSouthBottom);
roundXY(mEastNorthTop);
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolSelectLand (active, land)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_ARROW);
}
else
{
mDragEndValid = FALSE;
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolSelectLand (active, no land)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_NO);
}
@@ -183,13 +187,17 @@ BOOL LLToolSelectLand::handleHover(S32 x, S32 y, MASK mask)
}
else
{
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "hover handled by LLToolSelectLand (active, in slop)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_ARROW);
}
}
else
{
- LL_DEBUGS("UserInput") << "hover handled by LLToolSelectLand (inactive)" << LL_ENDL;
+#if SHOW_DEBUG
+ LL_DEBUGS("UserInput") << "hover handled by LLToolSelectLand (inactive)" << LL_ENDL;
+#endif
gViewerWindow->setCursor(UI_CURSOR_ARROW);
}
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index afbabe4c7c0..82d5f7c848b 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -727,7 +727,9 @@ BOOL LLViewerKeyboard::handleKey(KEY translated_key, MASK translated_mask, BOOL
return FALSE;
}
+#if SHOW_DEBUG
LL_DEBUGS("UserInput") << "keydown -" << translated_key << "-" << LL_ENDL;
+#endif
// skip skipped keys
if(mKeysSkippedByUI.find(translated_key) != mKeysSkippedByUI.end())
{
--
GitLab