diff options
author | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 10:19:19 -0500 |
commit | 522c4b4f0925463d5f30a4a0f314999a11d5def3 (patch) | |
tree | 9e6f25155182f643ace380179592516a08792646 /indra/newview/llviewercamera.cpp | |
parent | afc943acbc2bb79e2e1aa5d5eaf448e01b6c2b00 (diff) | |
parent | 5fca8915d8f44cdb2a4f7bb4715d61ba47043e5d (diff) |
Merge branch '965-eep-skies-too-bright-after-hdri-local-preview-merge' of https://github.com/secondlife/viewer into 965-eep-skies-too-bright-after-hdri-local-preview-merge
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
-rw-r--r-- | indra/newview/llviewercamera.cpp | 6 |
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(); |