merging in PE's fixes for new UI to mesh-development.

Included are upload floater tweaks, build panel tweaks,
and removing the mesh enabled checkbox in region tools.

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 9dab3a0400..90c1c252ed 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) ;
 
@@ -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;