diff options
| author | Richard Linden <none@none> | 2010-10-18 17:24:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-18 17:24:49 -0700 |
| commit | 97101982de2b434582a795e7d81c32010bed9c13 (patch) | |
| tree | b22333275afbccb1fd12e5014c00d6f3748196cf /indra/newview | |
| parent | 5080a19afae4cc04196c643f755f35431d37e3a0 (diff) | |
EXP-250 FIX Option to disable beacons
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/lltracker.cpp | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 37e1db20ff..f316909990 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8154,6 +8154,17 @@ <key>Value</key> <real>1.0</real> </map> + <key>RenderTrackerBeacon</key> + <map> + <key>Comment</key> + <string>Display tracking arrow and beacon to target avatar/teleport destination</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderTreeLODFactor</key> <map> <key>Comment</key> 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; } |