From 97101982de2b434582a795e7d81c32010bed9c13 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 18 Oct 2010 17:24:49 -0700 Subject: EXP-250 FIX Option to disable beacons --- indra/newview/lltracker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltracker.cpp') diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 8391c0f832..7ce19b528a 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -155,7 +155,7 @@ void LLTracker::drawHUDArrow() // static void LLTracker::render3D() { - if (!gFloaterWorldMap) + if (!gFloaterWorldMap || !gSavedSettings.getBOOL("RenderTrackerBeacon")) { return; } -- cgit v1.2.3 From 548f2e92ffd8e971c379860c77d76f1b26313ee5 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 18 Oct 2010 17:34:30 -0700 Subject: EXP-250 FIX Option to disable beacons hud arrow also controlled by RenderTrackerBeacon setting --- indra/newview/lltracker.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/lltracker.cpp') diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 7ce19b528a..61ea4bb0e6 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 -- cgit v1.2.3