diff options
| author | Richard Linden <none@none> | 2010-10-18 17:34:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-18 17:34:30 -0700 |
| commit | 548f2e92ffd8e971c379860c77d76f1b26313ee5 (patch) | |
| tree | 285169f1cef4869103dc353412e5d0be6fbc5284 /indra/newview | |
| parent | 97101982de2b434582a795e7d81c32010bed9c13 (diff) | |
EXP-250 FIX Option to disable beacons
hud arrow also controlled by RenderTrackerBeacon setting
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 4 | ||||
| -rw-r--r-- | indra/newview/lltracker.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f316909990..7788d6b2a0 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 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 |