fix for SH-4632: Water over land doesn't render when teleporting to the same place twice with location toolbar

1 files changed, 15 insertions, 1 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c2c981893a..c4fa80f0a2 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7385,12 +7385,26 @@ void LLPipeline::resetVertexBuffers()
 
 static LLTrace::BlockTimerStatHandle FTM_RESET_VB("Reset VB");
 
-void LLPipeline::doResetVertexBuffers()
+void LLPipeline::doResetVertexBuffers(bool forced)
 {
 	if (!mResetVertexBuffers)
 	{
 		return;
 	}
+	if(!forced && LLSpatialPartition::sTeleportRequested)
+	{
+		if(gAgent.getTeleportState() != LLAgent::TELEPORT_NONE)
+		{
+			return; //wait for teleporting to finish
+		}
+		else
+		{
+			//teleporting aborted
+			LLSpatialPartition::sTeleportRequested = FALSE;
+			mResetVertexBuffers = false;
+			return;
+		}
+	}
 
 	LL_RECORD_BLOCK_TIME(FTM_RESET_VB);
 	mResetVertexBuffers = false;