diff options
| author | Richard Linden <none@none> | 2010-12-08 16:04:07 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-12-08 16:04:07 -0800 |
| commit | ca2141ce90d484284bf57d72feb82e290958b061 (patch) | |
| tree | 0e2ea77f0b7c2a9c9f9e69c09c0be22567afac3b /indra/newview/lltracker.cpp | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
| parent | c28b476a6806a426593e6798ea537f13ca354fc8 (diff) | |
merge with viewer-dev
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; } |