summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-07-29 17:44:42 -0400
committerprep linden <prep@lindenlab.com>2011-07-29 17:44:42 -0400
commitc013c3ab5360f25ad4f9d0c7663c342367105324 (patch)
treebcc7dc6b50891f637e12c4887a727dc35802ce86 /indra/llprimitive
parent762143377a5c62bf79dabe158c72658a33873a2a (diff)
Removed joint Positional Compare because it was crashing on some rigs
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llmodel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 9dab3a0400..4f4e642f68 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -224,7 +224,7 @@ public:
bool areEqual( double a, double b )
{
const float epsilon = 1e-5f;
- return (abs(a - b) > epsilon) && (a < b);
+ return (abs(a - b) < epsilon) && (a < b);
}
//Make sure that we return false for any values that are within the tolerance for equivalence
bool operator() ( const LLVector3& a, const LLVector3& b )
@@ -239,7 +239,7 @@ public:
//map of positions to skin weights --- mSkinWeights[pos].mV[0..4] == <joint_index>.<weight>
//joint_index corresponds to mJointList
typedef std::vector<JointWeight> weight_list;
- typedef std::map<LLVector3, weight_list, JointPositionalCompare > weight_map;
+ typedef std::map<LLVector3, weight_list > weight_map;
weight_map mSkinWeights;
//get list of weight influences closest to given position