Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in RLVa. Viewer broken!

Browse Source
This commit is contained in:
Siana Gearz
2010-11-07 05:05:47 +01:00
parent ae4a9521af
commit 740b570168
94 changed files with 11249 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/lltracker.cpp
View File

@@ -65,6 +65,10 @@
#include "llworldmapview.h"
#include "llviewercontrol.h"
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
const F32 DESTINATION_REACHED_RADIUS = 3.0f;
const F32 DESTINATION_VISITED_RADIUS = 6.0f;
@@ -181,8 +185,12 @@ void LLTracker::render3D()
}
else
{
renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor,
instance()->mBeaconText, instance()->mTrackedLocationName );
//renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor,
// instance()->mBeaconText, instance()->mTrackedLocationName );
// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText,
(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : RlvStrings::getString(RLV_STRING_HIDDEN));
// [/RLVa:KB]
}
}
@@ -223,8 +231,13 @@ void LLTracker::render3D()
// and back again
instance()->mHasReachedLandmark = FALSE;
}
renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor,
instance()->mBeaconText, instance()->mTrackedLandmarkName );
//renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor,
// instance()->mBeaconText, instance()->mTrackedLandmarkName );
// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText,
(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName
: RlvStrings::getString(RLV_STRING_HIDDEN));
// [/RLVa:KB]
}
}
else
@@ -252,8 +265,12 @@ void LLTracker::render3D()
}
else
{
renderBeacon( av_tracker.getGlobalPos(), gTrackColor,
instance()->mBeaconText, av_tracker.getName() );
//renderBeacon( av_tracker.getGlobalPos(), gTrackColor,
// instance()->mBeaconText, av_tracker.getName() );
// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText,
(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : RlvStrings::getString(RLV_STRING_HIDDEN));
// [/RLVa:KB]
}
}
else