diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-12 20:35:48 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-12 20:54:29 +0300 |
| commit | 922d2324d06326602fdf5770bc555e3e9f90e74b (patch) | |
| tree | 2b5a0372cf8f83e4495d48230db9a996fee7f1f8 | |
| parent | f7f06063c7fc6decbbf427b211c7cd61603aaca4 (diff) | |
#4535 Revert "Fix: ignore *pass-on* counters when detecting left-button grabs (#3990)"
This reverts commit 65d70a8d8f211b462481e93f919a100c8b3b2af5.
| -rw-r--r-- | indra/newview/llagent.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 83b3d26560..085155714a 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3430,14 +3430,11 @@ void LLAgent::initOriginGlobal(const LLVector3d &origin_global) bool LLAgent::leftButtonGrabbed() const { - if (gAgentCamera.cameraMouselook()) - { - return mControlsTakenCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0; - } - else - { - return mControlsTakenCount[CONTROL_LBUTTON_DOWN_INDEX] > 0; - } + const bool camera_mouse_look = gAgentCamera.cameraMouselook(); + return (!camera_mouse_look && mControlsTakenCount[CONTROL_LBUTTON_DOWN_INDEX] > 0) + || (camera_mouse_look && mControlsTakenCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0) + || (!camera_mouse_look && mControlsTakenPassedOnCount[CONTROL_LBUTTON_DOWN_INDEX] > 0) + || (camera_mouse_look && mControlsTakenPassedOnCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0); } bool LLAgent::rotateGrabbed() const |