diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:41:56 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:41:56 +0300 |
| commit | 3175525950ecf568eb75a6cb4f9283ee32dcd9a5 (patch) | |
| tree | e7e28987b5618ffcf081a3ef0bdbb9717ccd1d6c /indra/llprimitive/llmodel.h | |
| parent | 9d2cb130e35fcbab98d5e7cb4d0d26ca6a16503b (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llprimitive/llmodel.h')
| -rw-r--r-- | indra/llprimitive/llmodel.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index cf3288489a..51fa2f8079 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -154,7 +154,6 @@ public: void ClearFacesAndMaterials() { mVolumeFaces.clear(); mMaterialList.clear(); } std::string getName() const; - std::string getMetric() const {return mMetric;} EModelStatus getStatus() const {return mStatus;} static std::string getStatusString(U32 status) ; @@ -260,8 +259,6 @@ 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; |