From d9fdb948d9b7d7b873ec83c43332f97018573194 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 29 Nov 2018 21:04:35 +0200 Subject: SL-9747 [Mesh Uploader] Remove confusing model_metric from upload --- indra/llprimitive/llmodel.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/llprimitive') 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; -- cgit v1.2.3 From 0acab8ba2d22e9b0ce0dec1a41813242419e057f Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 24 Dec 2018 15:57:04 +0200 Subject: SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube --- indra/llprimitive/llprimitive.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index c69c059880..27d1bee9bd 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1580,7 +1580,7 @@ bool LLPrimitive::getTESTAxes(const U8 face, U32* s_axis, U32* t_axis) *s_axis = VY; *t_axis = VZ; return true; } - else if (face == 5) + else if (face >= 5) { *s_axis = VX; *t_axis = VY; return true; -- cgit v1.2.3