diff options
Diffstat (limited to 'linden/indra/newview/lltracker.cpp')
-rw-r--r-- | linden/indra/newview/lltracker.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp index 654510d..43fd4c0 100644 --- a/linden/indra/newview/lltracker.cpp +++ b/linden/indra/newview/lltracker.cpp | |||
@@ -65,6 +65,10 @@ | |||
65 | #include "llworldmapview.h" | 65 | #include "llworldmapview.h" |
66 | #include "llviewercontrol.h" | 66 | #include "llviewercontrol.h" |
67 | 67 | ||
68 | // [RLVa:KB] | ||
69 | #include "rlvhandler.h" | ||
70 | // [/RLVa:KB] | ||
71 | |||
68 | const F32 DESTINATION_REACHED_RADIUS = 3.0f; | 72 | const F32 DESTINATION_REACHED_RADIUS = 3.0f; |
69 | const F32 DESTINATION_VISITED_RADIUS = 6.0f; | 73 | const F32 DESTINATION_VISITED_RADIUS = 6.0f; |
70 | 74 | ||
@@ -185,7 +189,7 @@ void LLTracker::render3D() | |||
185 | // instance()->mBeaconText, instance()->mTrackedLocationName ); | 189 | // instance()->mBeaconText, instance()->mTrackedLocationName ); |
186 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | 190 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a |
187 | renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, | 191 | renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, |
188 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : rlv_handler_t::cstrHidden); | 192 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : RlvStrings::getString(RLV_STRING_HIDDEN)); |
189 | // [/RLVa:KB] | 193 | // [/RLVa:KB] |
190 | } | 194 | } |
191 | } | 195 | } |
@@ -231,7 +235,8 @@ void LLTracker::render3D() | |||
231 | // instance()->mBeaconText, instance()->mTrackedLandmarkName ); | 235 | // instance()->mBeaconText, instance()->mTrackedLandmarkName ); |
232 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | 236 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a |
233 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, | 237 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, |
234 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName : rlv_handler_t::cstrHidden); | 238 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName |
239 | : RlvStrings::getString(RLV_STRING_HIDDEN)); | ||
235 | // [/RLVa:KB] | 240 | // [/RLVa:KB] |
236 | } | 241 | } |
237 | } | 242 | } |
@@ -264,7 +269,7 @@ void LLTracker::render3D() | |||
264 | // instance()->mBeaconText, av_tracker.getName() ); | 269 | // instance()->mBeaconText, av_tracker.getName() ); |
265 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | 270 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a |
266 | renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText, | 271 | renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText, |
267 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : rlv_handler_t::cstrHidden); | 272 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : RlvStrings::getString(RLV_STRING_HIDDEN)); |
268 | // [/RLVa:KB] | 273 | // [/RLVa:KB] |
269 | } | 274 | } |
270 | } | 275 | } |