diff options
| author | seth_productengine <none@none> | 2011-07-22 22:40:18 +0300 |
|---|---|---|
| committer | seth_productengine <none@none> | 2011-07-22 22:40:18 +0300 |
| commit | 50b9c63382121df879680cf43f5be6fc09686607 (patch) | |
| tree | 0c719c97d8d2beb802b3845505a5af0985a57e81 /indra/llprimitive | |
| parent | aa40614cd4cf05d3d8e78be2e05a0f5cdcfde5cc (diff) | |
SH-1868 WIP Added user-supplied metric data for uploading a model.
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.
The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmodel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 3f58eba07d..35fdf3f3d6 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) ; @@ -234,6 +235,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; |