Merge tag 'Second_Life_Release#17540023-2025.07' into 2025.07

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 4e08f7219d..b6d31c0cae 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1754,7 +1754,6 @@ F32 LLAgentCamera::calcCameraFOVZoomFactor()
 LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(bool *hit_limit)
 {
     // Compute base camera position and look-at points.
-    F32         camera_land_height;
     LLVector3d  frame_center_global = !isAgentAvatarValid() ?
         gAgent.getPositionGlobal() :
         gAgent.getPosGlobalFromAgent(getAvatarRootPosition());
@@ -1991,10 +1990,11 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(bool *hit_limit)
         }
     }
 
-    // Don't let camera go underground
-    F32 camera_min_off_ground = getCameraMinOffGround();
-    camera_land_height = LLWorld::getInstance()->resolveLandHeightGlobal(camera_position_global);
-    F32 minZ = llmax(F_ALMOST_ZERO, camera_land_height + camera_min_off_ground);
+    // Don't let camera go underground if constrained
+    // If not constrained, permit going 1000m below 0, use case: retrieving objects
+    F32 camera_min_off_ground = getCameraMinOffGround(); // checks isDisableCameraConstraints
+    F32 camera_land_height = LLWorld::getInstance()->resolveLandHeightGlobal(camera_position_global);
+    F32 minZ = camera_land_height + camera_min_off_ground;
     if (camera_position_global.mdV[VZ] < minZ)
     {
         camera_position_global.mdV[VZ] = minZ;