diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
| commit | db11a76d519ebb076ec0b72284993d7f6c15f383 (patch) | |
| tree | 2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/newview/lltracker.cpp | |
| parent | 3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff) | |
| parent | fb8ba15801f0620699fecdf2ed08668df0be7210 (diff) | |
Merge from viewer-development post 2.4 release
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; } |