diff options
author | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
---|---|---|
committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
commit | 38208441db5e969112a4b911aa4d063d5a1031f2 (patch) | |
tree | 84158d6183058b48737ba9b19304bd4ae5f57afa /indra/newview/pipeline.cpp | |
parent | 92b09e3a164e59f5a0c4e436d044590513ddc6bd (diff) | |
parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-559
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b23c1fe741..ee2dc82505 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3976,7 +3976,7 @@ void LLPipeline::postSort(LLCamera& camera) } LL_PUSH_CALLSTACKS(); // If managing your telehub, draw beacons at telehub and currently selected spawnpoint. - if (LLFloaterTelehub::renderBeacons()) + if (LLFloaterTelehub::renderBeacons() && !sShadowRender) { LLFloaterTelehub::addBeacons(); } |