diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-02-22 15:00:53 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-02-22 15:00:53 -0600 |
| commit | ce534cf32e1df84b6b10435e9604b0cbde6abf95 (patch) | |
| tree | 0549c54b68cf82ce60a6ce8202ed094d054165e9 /indra/newview/lltracker.cpp | |
| parent | 1c5c45f27317d6ee7c2c30de11f43aeee3855434 (diff) | |
| parent | 900c13d361671c35cd5899dc99bbfbc9c5ec2200 (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 728d0c9417..ab4ad5817b 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -109,7 +109,16 @@ void LLTracker::stopTracking(bool clear_ui) // static virtual void LLTracker::drawHUDArrow() { - if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return; + if (!LLWorld::instanceExists()) + { + return; + } + + static LLCachedControl<bool> render_beacon(gSavedSettings, "RenderTrackerBeacon", true); + if (!render_beacon) + { + return; + } if (gViewerWindow->getProgressView()->getVisible()) return; |