1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index d472ff7dc2..a070711727 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -764,6 +764,12 @@ bool LLViewerCamera::cameraUnderWater() const
 {
     LLViewerRegion* regionp = LLWorld::instance().getRegionFromPosAgent(getOrigin());
 
+    if (gPipeline.mHeroProbeManager.isMirrorPass())
+    {
+        // TODO: figure out how to handle this case
+        return false;
+    }
+
     if (!regionp)
     {
         regionp = gAgent.getRegion();