diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-08 18:32:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-08 18:32:24 -0400 |
| commit | 28678996ceaea019aafaa26911a440769320c498 (patch) | |
| tree | 1c5461d5b432b2b6114faee0ebfb1bb2d2f5095a /indra/newview/llagent.cpp | |
| parent | a6feb3dc7f3b1985bcc6a16330b368917cff25f8 (diff) | |
| parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) | |
Merge pull request #4382 from secondlife/release/2025.05
Release/2025.05
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 2161dbe19e..039bd4da2a 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3469,11 +3469,14 @@ void LLAgent::initOriginGlobal(const LLVector3d &origin_global) bool LLAgent::leftButtonGrabbed() const { - 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); + if (gAgentCamera.cameraMouselook()) + { + return mControlsTakenCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0; + } + else + { + return mControlsTakenCount[CONTROL_LBUTTON_DOWN_INDEX] > 0; + } } bool LLAgent::rotateGrabbed() const |