diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
commit | 1e050c2ed87ae2093623fa4c66a69aeee1fb980c (patch) | |
tree | ff9bf66608dc3b9c4459daa68ec99a3065182aac /indra/newview/lltracker.cpp | |
parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) | |
parent | d276950c8d4d53f9d5d6497d5a4a4582c499938a (diff) |
merge
Diffstat (limited to 'indra/newview/lltracker.cpp')
-rw-r--r-- | indra/newview/lltracker.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index c3dd17def9..983108391f 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -109,6 +109,8 @@ void LLTracker::stopTracking(void* userdata) // static virtual void LLTracker::drawHUDArrow() { + if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return; + static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white); /* tracking autopilot destination has been disabled @@ -155,7 +157,7 @@ void LLTracker::drawHUDArrow() // static void LLTracker::render3D() { - if (!gFloaterWorldMap) + if (!gFloaterWorldMap || !gSavedSettings.getBOOL("RenderTrackerBeacon")) { return; } |