From 7691780825940364e3faa7a682490f51491d44dc Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 25 May 2017 11:11:02 +0100
Subject: SL-694 - Added extra param field for flags related to extended mesh
 functionality. Currently this is just one bit to flag an object as able to
 animate

---
 indra/llprimitive/llprimitive.cpp | 65 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

(limited to 'indra/llprimitive/llprimitive.cpp')

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index bfa65666b5..54b87fec78 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1599,6 +1599,8 @@ BOOL LLNetworkData::isValid(U16 param_type, U32 size)
 		return (size == 17);
 	case PARAMS_LIGHT_IMAGE:
 		return (size == 28);
+    case PARAMS_EXTENDED_MESH:
+        return (size == 4);
 	}
 	
 	return FALSE;
@@ -2026,3 +2028,66 @@ bool LLLightImageParams::fromLLSD(LLSD& sd)
 	
 	return false;
 }
+
+//============================================================================
+
+LLExtendedMeshParams::LLExtendedMeshParams()
+{
+	mFlags = 0;
+}
+
+BOOL LLExtendedMeshParams::pack(LLDataPacker &dp) const
+{
+	dp.packU32(mFlags, "flags");
+
+	return TRUE;
+}
+
+BOOL LLExtendedMeshParams::unpack(LLDataPacker &dp)
+{
+	dp.unpackU32(mFlags, "flags");
+	
+	return TRUE;
+}
+
+bool LLExtendedMeshParams::operator==(const LLNetworkData& data) const
+{
+	if (data.mType != PARAMS_EXTENDED_MESH)
+	{
+		return false;
+	}
+	
+	const LLExtendedMeshParams *param = (const LLExtendedMeshParams*)&data;
+	if ( (param->mFlags != mFlags) )
+	{
+		return false;
+	}
+
+	return true;
+}
+
+void LLExtendedMeshParams::copy(const LLNetworkData& data)
+{
+	const LLExtendedMeshParams *param = (LLExtendedMeshParams*)&data;
+	mFlags = param->mFlags;
+}
+
+LLSD LLExtendedMeshParams::asLLSD() const
+{
+	LLSD sd;
+	
+	sd["flags"] = LLSD::Integer(mFlags);
+		
+	return sd;
+}
+
+bool LLExtendedMeshParams::fromLLSD(LLSD& sd)
+{
+	if (sd.has("flags"))
+	{
+		setFlags( sd["flags"].asInteger());
+		return true;
+	} 
+	
+	return false;
+}
-- 
cgit v1.2.3


From 4d68945595227b0f863a1c496be5da0f3c3c5113 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 30 May 2017 15:59:23 +0100
Subject: SL-694 - UI initialization, set mType in LLExtendedMeshParams
 constructor

---
 indra/llprimitive/llprimitive.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llprimitive/llprimitive.cpp')

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 54b87fec78..c847cf653f 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -2033,6 +2033,7 @@ bool LLLightImageParams::fromLLSD(LLSD& sd)
 
 LLExtendedMeshParams::LLExtendedMeshParams()
 {
+    mType = PARAMS_EXTENDED_MESH;
 	mFlags = 0;
 }
 
-- 
cgit v1.2.3