diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:24:42 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:24:42 +0800 |
| commit | 73fdef6693017f1160875d1f7a79875945df3929 (patch) | |
| tree | 4d68801d232b579d03fef2306c53637f7498df45 /indra/newview/llagent.cpp | |
| parent | 3b776461127f193298018cbe1bbeb92478cca485 (diff) | |
| parent | bfefc01a7baefa6377216ff236be6113c46fa879 (diff) | |
Merge branch '2025.05' into 2025.06
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 1cd58b7101..e12616098c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3444,11 +3444,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 |