summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 14:27:56 -0700
committercallum_linden <none@none>2014-10-17 14:27:56 -0700
commita38e89bf11933f0abf8996dbb7d43407903a44d6 (patch)
tree24567696ef8af6d543095f12476afea9667aa0c4 /indra
parentc02ba7ceb5ca3fad58b232ac04f3a702dbb374cf (diff)
Update to build on Xcode 6.0: clang detecting unsigned int comparison with >=0 [-Wtautological-compare] - confirmed fix with davep
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llmath/llvolume.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 8c4603d5ea..503dea2081 100755
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4914,9 +4914,7 @@ F64 find_vertex_score(LLVCacheVertexData& data)
{
F64 score = -1.0;
- if (data.mActiveTriangles >= 0)
- {
- score = 0.0;
+ score = 0.0;
S32 cache_idx = data.mCacheTag;
@@ -4938,9 +4936,8 @@ F64 find_vertex_score(LLVCacheVertexData& data)
}
//bonus points for having low valence
- F64 valence_boost = pow((F64)data.mActiveTriangles, -FindVertexScore_ValenceBoostPower);
+ F64 valence_boost = pow((F64)data.mActiveTriangles, -FindVertexScore_ValenceBoostPower);
score += FindVertexScore_ValenceBoostScale * valence_boost;
- }
return score;
}