diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f3169099907191e0252c2587a000ecc9f852137c..7788d6b2a09ed03d925c7468abe5560a95c8a0d4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8155,9 +8155,9 @@ <real>1.0</real> </map> <key>RenderTrackerBeacon</key> - <map> + <map> <key>Comment</key> - <string>Display tracking arrow and beacon to target avatar/teleport destination</string> + <string>Display tracking arrow and beacon to target avatar, teleport destination</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 7ce19b528aeb519ec36c38164d98dbc611e19c2f..61ea4bb0e6089f765a73cac151fedaacfadb3e18 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