diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-27 23:58:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 23:58:12 -0400 |
| commit | 06a9e45fa371365f56549fe1c1628bf7cf8589d1 (patch) | |
| tree | 601bfe8f31052620321811582244d12a29d6d7a1 /indra/newview/llagent.cpp | |
| parent | 895db142ee9224e1b8e4d2fc6348dc1801bea0dc (diff) | |
| parent | a50a0e1277386de3456f478127f774fa01cdb578 (diff) | |
Merge pull request #4308 from secondlife/geenz/develop-to-gltf-mesh
Geenz/develop to gltf mesh
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 |