From 9f10853c03293f845d9a17adcf8de7ea23a0a778 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 21 Feb 2022 16:07:58 +0200 Subject: SL-16887 FIXED Crash in LLNetMap::draw --- indra/newview/lltracker.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/lltracker.cpp') diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 728d0c9417..320554c39e 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -109,7 +109,12 @@ void LLTracker::stopTracking(bool clear_ui) // static virtual void LLTracker::drawHUDArrow() { - if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return; + if (!LLWorld::instanceExists()) + { + return; + } + + if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return; if (gViewerWindow->getProgressView()->getVisible()) return; -- cgit v1.2.3 From 97f6736d7fe2575023eff3a6429855c19d9f92f5 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 21 Feb 2022 17:46:27 +0200 Subject: Cached setting should be used in draw() calls --- indra/newview/lltracker.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltracker.cpp') diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 320554c39e..ab4ad5817b 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -113,8 +113,12 @@ void LLTracker::drawHUDArrow() { return; } - - if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return; + + static LLCachedControl render_beacon(gSavedSettings, "RenderTrackerBeacon", true); + if (!render_beacon) + { + return; + } if (gViewerWindow->getProgressView()->getVisible()) return; -- cgit v1.2.3