diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/lltracker.cpp | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/lltracker.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp index 8e81152..654510d 100644 --- a/linden/indra/newview/lltracker.cpp +++ b/linden/indra/newview/lltracker.cpp | |||
| @@ -181,8 +181,12 @@ void LLTracker::render3D() | |||
| 181 | } | 181 | } |
| 182 | else | 182 | else |
| 183 | { | 183 | { |
| 184 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, | 184 | //renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, |
| 185 | instance()->mBeaconText, instance()->mTrackedLocationName ); | 185 | // instance()->mBeaconText, instance()->mTrackedLocationName ); |
| 186 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | ||
| 187 | renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, | ||
| 188 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : rlv_handler_t::cstrHidden); | ||
| 189 | // [/RLVa:KB] | ||
| 186 | } | 190 | } |
| 187 | } | 191 | } |
| 188 | 192 | ||
| @@ -223,8 +227,12 @@ void LLTracker::render3D() | |||
| 223 | // and back again | 227 | // and back again |
| 224 | instance()->mHasReachedLandmark = FALSE; | 228 | instance()->mHasReachedLandmark = FALSE; |
| 225 | } | 229 | } |
| 226 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, | 230 | //renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, |
| 227 | instance()->mBeaconText, instance()->mTrackedLandmarkName ); | 231 | // instance()->mBeaconText, instance()->mTrackedLandmarkName ); |
| 232 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | ||
| 233 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, | ||
| 234 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName : rlv_handler_t::cstrHidden); | ||
| 235 | // [/RLVa:KB] | ||
| 228 | } | 236 | } |
| 229 | } | 237 | } |
| 230 | else | 238 | else |
| @@ -252,8 +260,12 @@ void LLTracker::render3D() | |||
| 252 | } | 260 | } |
| 253 | else | 261 | else |
| 254 | { | 262 | { |
| 255 | renderBeacon( av_tracker.getGlobalPos(), gTrackColor, | 263 | //renderBeacon( av_tracker.getGlobalPos(), gTrackColor, |
| 256 | instance()->mBeaconText, av_tracker.getName() ); | 264 | // instance()->mBeaconText, av_tracker.getName() ); |
| 265 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | ||
| 266 | renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText, | ||
| 267 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : rlv_handler_t::cstrHidden); | ||
| 268 | // [/RLVa:KB] | ||
| 257 | } | 269 | } |
| 258 | } | 270 | } |
| 259 | else | 271 | else |