diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-06-11 12:33:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 12:33:53 -0400 |
| commit | e92689063bdbe34907348a12f1db39bc81132783 (patch) | |
| tree | 3d7b76e4f82fbb147e6c07f104fb85c55246fd99 /indra/newview/llviewercamera.cpp | |
| parent | f3bfc13f7957a5f142871bddc57d63cd08595ad9 (diff) | |
| parent | b5546377b0aa2482756b1dad4258659edc630c3b (diff) | |
Merge pull request #1697 from secondlife/lua-bradfix
Merge promoted Featurettes + Brad's GitHub Windows build workaround.
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 d261190d22..437f1239bf 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(); |