merge

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 4f4e642f68..b5dd9bf87d 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -148,6 +148,7 @@ public:
 	static LLModel* loadModelFromDomMesh(domMesh* mesh);
 	static std::string getElementLabel(daeElement* element);
 	std::string getName() const;
+	std::string getMetric() const {return mMetric;}
 	EModelStatus getStatus() const {return mStatus;}
 	static std::string getStatusString(U32 status) ;
 
@@ -224,7 +225,7 @@ public:
 		bool areEqual( double a, double b )
 		{
 			const float epsilon = 1e-5f;
-			return (abs(a - b) < epsilon) && (a < b);
+			return (abs((int)(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 )
@@ -250,6 +251,8 @@ public:
 	std::string mRequestedLabel; // name requested in UI, if any.
 	std::string mLabel; // name computed from dae.
 
+	std::string mMetric; // user-supplied metric data for upload
+
 	LLVector3 mNormalizedScale;
 	LLVector3 mNormalizedTranslation;