From 3be18ddce570ce69286d2c94f82487017856312c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 22 Aug 2021 21:06:46 -0400
Subject: [PATCH] Allow instant transition between above and below water

---
 indra/newview/llviewercamera.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index c486e40d612..0ef30917aa7 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -121,18 +121,7 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
 
 	mLastPointOfInterest = point_of_interest;
 
-	LLViewerRegion * regp = gAgent.getRegion();
-	F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
-
 	LLVector3 origin = center;
-	if (origin.mV[2] > water_height)
-	{
-		origin.mV[2] = llmax(origin.mV[2], water_height+0.20f);
-	}
-	else
-	{
-		origin.mV[2] = llmin(origin.mV[2], water_height-0.20f);
-	}
 
 	setOriginAndLookAt(origin, up_direction, point_of_interest);
 
-- 
GitLab