diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-29 13:09:59 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-29 13:09:59 -0500 |
| commit | 7a0ca277f82acd2511a5dbf33956c1665d14b957 (patch) | |
| tree | 648c1fa5130438f465e0a8770ea5a03eccb4164e /indra/newview/pipeline.cpp | |
| parent | bd653fb69382e5a94417ff13c4041b2bc7efdc1f (diff) | |
| parent | 5641f9612cfadaac697a54a4c80b4bb08815bc5b (diff) | |
SL-16094: Merge branch 'DRTVWR-546' into glthread
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d9d97ac1e5..5b6de5874b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4010,8 +4010,11 @@ void render_hud_elements() // Draw the tracking overlays LLTracker::render3D(); - // Show the property lines - LLWorld::getInstance()->renderPropertyLines(); + if (LLWorld::instanceExists()) + { + // Show the property lines + LLWorld::getInstance()->renderPropertyLines(); + } LLViewerParcelMgr::getInstance()->render(); LLViewerParcelMgr::getInstance()->renderParcelCollision(); |