diff options
| author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
| commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
| tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/lltracker.cpp | |
| parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
| download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz | |
Merged in jacek/next
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 bd2f659..cf98c7a 100644 --- a/linden/indra/newview/lltracker.cpp +++ b/linden/indra/newview/lltracker.cpp | |||
| @@ -180,8 +180,12 @@ void LLTracker::render3D() | |||
| 180 | } | 180 | } |
| 181 | else | 181 | else |
| 182 | { | 182 | { |
| 183 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, | 183 | //renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, |
| 184 | instance()->mBeaconText, instance()->mTrackedLocationName ); | 184 | // instance()->mBeaconText, instance()->mTrackedLocationName ); |
| 185 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | ||
| 186 | renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, | ||
| 187 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : rlv_handler_t::cstrHidden); | ||
| 188 | // [/RLVa:KB] | ||
| 185 | } | 189 | } |
| 186 | } | 190 | } |
| 187 | 191 | ||
| @@ -222,8 +226,12 @@ void LLTracker::render3D() | |||
| 222 | // and back again | 226 | // and back again |
| 223 | instance()->mHasReachedLandmark = FALSE; | 227 | instance()->mHasReachedLandmark = FALSE; |
| 224 | } | 228 | } |
| 225 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, | 229 | //renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, |
| 226 | instance()->mBeaconText, instance()->mTrackedLandmarkName ); | 230 | // instance()->mBeaconText, instance()->mTrackedLandmarkName ); |
| 231 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | ||
| 232 | renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, | ||
| 233 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName : rlv_handler_t::cstrHidden); | ||
| 234 | // [/RLVa:KB] | ||
| 227 | } | 235 | } |
| 228 | } | 236 | } |
| 229 | else | 237 | else |
| @@ -251,8 +259,12 @@ void LLTracker::render3D() | |||
| 251 | } | 259 | } |
| 252 | else | 260 | else |
| 253 | { | 261 | { |
| 254 | renderBeacon( av_tracker.getGlobalPos(), gTrackColor, | 262 | //renderBeacon( av_tracker.getGlobalPos(), gTrackColor, |
| 255 | instance()->mBeaconText, av_tracker.getName() ); | 263 | // instance()->mBeaconText, av_tracker.getName() ); |
| 264 | // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a | ||
| 265 | renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText, | ||
| 266 | (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : rlv_handler_t::cstrHidden); | ||
| 267 | // [/RLVa:KB] | ||
| 256 | } | 268 | } |
| 257 | } | 269 | } |
| 258 | else | 270 | else |