summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercamera.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-02-08 15:34:01 -0600
committerGitHub <noreply@github.com>2024-02-08 15:34:01 -0600
commitba9bae05706982f982df8d615a28ac9c7c3c51fe (patch)
tree4b688dcb22e6c65c7c8edde6e5a0d649ecd3751c /indra/newview/llviewercamera.cpp
parent4f6e3acece507b8be66b76db5609bdaec41307d4 (diff)
parentc3d4f571aa5522e3028842c6d7caa977819a7393 (diff)
Merge pull request #715 from secondlife/materials_featurette/mirrors
Mirrors pre-release
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
-rw-r--r--indra/newview/llviewercamera.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index 4134e35f87..9ba42e4f47 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();