From d9341caf45fa888824c93d9c2b24fdb7659f181b Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 17 Jul 2015 17:36:33 +0300
Subject: MAINT-5364 FIXED Object with invalid sculpt topology type cannot be
 seen or selected

---
 indra/llmath/llvolume.cpp | 29 +----------------------------
 indra/llmath/llvolume.h   |  9 +++++----
 2 files changed, 6 insertions(+), 32 deletions(-)

(limited to 'indra/llmath')

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 82081ca853..41ee3941ac 100755
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -3178,16 +3178,6 @@ BOOL LLVolume::isFlat(S32 face)
 }
 
 
-LLVolumeParams::LLVolumeParams( LLProfileParams &profile,
-								LLPathParams &path,
-								LLUUID sculpt_id,
-								U8 sculpt_type) :
-mProfileParams(profile),
-mPathParams(path)
-{
-	setSculptID(sculpt_id, sculpt_type);
-}
-
 bool LLVolumeParams::isSculpt() const
 {
 	return mSculptID.notNull();
@@ -3504,24 +3494,7 @@ bool LLVolumeParams::setSkew(const F32 skew_value)
 bool LLVolumeParams::setSculptID(const LLUUID sculpt_id, U8 sculpt_type)
 {
 	mSculptID = sculpt_id;
-	// Check sculpt type value, it consist of type and flags
-	U8 type = sculpt_type & LL_SCULPT_TYPE_MASK;
-	U8 flags = sculpt_type & LL_SCULPT_FLAG_MASK;
-	if (sculpt_type != (type | flags) || type > LL_SCULPT_TYPE_MAX)
-	{
-		if (sculpt_id != LLUUID::null)
-		{
-			mSculptType = LL_SCULPT_TYPE_MESH;
-		}
-		else
-		{
-			mSculptType = LL_SCULPT_TYPE_SPHERE;
-		}
-	}
-	else
-	{
-		mSculptType = sculpt_type;
-	}
+	mSculptType = sculpt_type;
 	return true;
 }
 
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 06688cacc9..e1161682b5 100755
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -560,10 +560,11 @@ public:
 	{
 	}
 
-	LLVolumeParams( LLProfileParams &profile,
-					LLPathParams &path,
-					LLUUID sculpt_id = LLUUID::null,
-					U8 sculpt_type = LL_SCULPT_TYPE_NONE);
+	LLVolumeParams(LLProfileParams &profile, LLPathParams &path,
+				   LLUUID sculpt_id = LLUUID::null, U8 sculpt_type = LL_SCULPT_TYPE_NONE)
+		: mProfileParams(profile), mPathParams(path), mSculptID(sculpt_id), mSculptType(sculpt_type)
+	{
+	}
 
 	bool operator==(const LLVolumeParams &params) const;
 	bool operator!=(const LLVolumeParams &params) const;
-- 
cgit v1.2.3