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 | |
| parent | bd653fb69382e5a94417ff13c4041b2bc7efdc1f (diff) | |
| parent | 5641f9612cfadaac697a54a4c80b4bb08815bc5b (diff) | |
SL-16094: Merge branch 'DRTVWR-546' into glthread
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e13c0a2472..d6c6eb6a98 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1734,7 +1734,7 @@ bool LLAppViewer::cleanup() //ditch LLVOAvatarSelf instance gAgentAvatarp = NULL; - LLNotifications::instance().clear(); + LLNotifications::instance().clear(); // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); @@ -1775,6 +1775,7 @@ bool LLAppViewer::cleanup() LLPluginProcessParent::shutdown(); disconnectViewer(); + LLViewerCamera::deleteSingleton(); LL_INFOS() << "Viewer disconnected" << LL_ENDL; @@ -5696,7 +5697,6 @@ void LLAppViewer::disconnectViewer() LLWorld::getInstance()->destroyClass(); } LLVOCache::deleteSingleton(); - LLViewerCamera::deleteSingleton(); // call all self-registered classes LLDestroyClassList::instance().fireCallbacks(); 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(); |