From c28eb36a2c09f31f491676c8548dfa1c19277ce2 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 5 Dec 2023 19:50:25 -0600
Subject: SL-20654 Fix for box probes sometimes glitching out at the corners. 
 Incidental fix for crash when mWaterPool is null.

---
 indra/newview/pipeline.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/pipeline.cpp')

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 50cd4adb73..bf4f0083ff 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8303,7 +8303,10 @@ void LLPipeline::doWaterHaze()
             gGLLastMatrix = NULL;
             gGL.loadMatrix(gGLModelView);
 
-            mWaterPool->pushFaceGeometry();
+            if (mWaterPool)
+            {
+                mWaterPool->pushFaceGeometry();
+            }
         }
 
         unbindDeferredShader(haze_shader);
-- 
cgit v1.2.3