livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux build fix - cast incoming color values to U8's.

meow-7.2.2
prep 2012-03-28 13:54:06 -04:00
parent 7ca2c94bf5
commit acaa680940
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -1012,46 +1012,47 @@ void LLFloaterPathfindingConsole::regionCrossingOccured()
void LLFloaterPathfindingConsole::fillInColorsForNavMeshVisualization()
{
LLPathingLib::NavMeshColors colors;
LLVector3 in = gSavedSettings.getVector3("WalkableRGB");
F32 a = gSavedSettings.getF32("WalkableA");
colors.mWalkable= LLColor4U( in[0],in[1],in[2],a );
colors.mWalkable= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("ObstacleRGB");
a = gSavedSettings.getF32("ObstacleA");
colors.mObstacle= LLColor4U( in[0],in[1],in[2],a );
colors.mObstacle= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("MaterialRGB");
a = gSavedSettings.getF32("MaterialA");
colors.mMaterial= LLColor4U( in[0],in[1],in[2],a );
colors.mMaterial= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("ExclusionRGB");
a = gSavedSettings.getF32("ExclusionA");
colors.mExclusion= LLColor4U( in[0],in[1],in[2],a );
colors.mExclusion= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("ConnectedEdgeRGB");
a = gSavedSettings.getF32("ConnectedEdgeA");
colors.mConnectedEdge= LLColor4U( in[0],in[1],in[2],a );
colors.mConnectedEdge= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("BoundaryEdgeRGB");
a = gSavedSettings.getF32("BoundaryEdgeA");
colors.mBoundaryEdge= LLColor4U( in[0],in[1],in[2],a );
colors.mBoundaryEdge= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("HeatColorBase");
a = gSavedSettings.getF32("HeatColorBaseA");
colors.mHeatColorBase= LLColor4U( in[0],in[1],in[2],a );
colors.mHeatColorBase= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("HeatColorMax");
a = gSavedSettings.getF32("HeatColorMaxA");
colors.mHeatColorMax= LLColor4U( in[0],in[1],in[2],a );
colors.mHeatColorMax= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("FaceColorRGB");
a = gSavedSettings.getF32("FaceColorA");
colors.mFaceColor= LLColor4U( in[0],in[1],in[2],a );
colors.mFaceColor= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2],(U8)a );
in = gSavedSettings.getVector3("NavMeshClearRGB");
colors.mNavMeshClear= LLColor4U( in[0],in[1],in[2],0 );
colors.mNavMeshClear= LLColor4U( (U8)in[0],(U8)in[1],(U8)in[2], 0 );
mNavMeshColors = colors;