diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
| commit | dee57bea2526c84fb753abfd08e22c19f1cad21c (patch) | |
| tree | 7fbe9a8cbb5957b78a37eb13f58f8b6786ec8cac /indra/newview/lltracker.cpp | |
| parent | 67ca1c0b62cec74495104c0d78fc3743775bfd4e (diff) | |
| parent | 25eef545fd7f6513ae4c590126aef1dc06494f56 (diff) | |
Merge from viewer-development.
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; } |