Restore LLMaterialID to POD type

Signed-off-by: Rye <rye@alchemyviewer.org>

3 files changed, 1 insertions, 29 deletions

diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp
index 4992b282f3..b417f095ca 100644
--- a/indra/llprimitive/llmaterialid.cpp
+++ b/indra/llprimitive/llmaterialid.cpp
@@ -56,20 +56,11 @@ LLMaterialID::LLMaterialID(const void* pMemory)
     set(pMemory);
 }
 
-LLMaterialID::LLMaterialID(const LLMaterialID& pOtherMaterialID)
-{
-    copyFromOtherMaterialID(pOtherMaterialID);
-}
-
 LLMaterialID::LLMaterialID(const LLUUID& lluid)
 {
     set(lluid.mData);
 }
 
-LLMaterialID::~LLMaterialID()
-{
-}
-
 bool LLMaterialID::operator == (const LLMaterialID& pOtherMaterialID) const
 {
     return (compareToOtherMaterialID(pOtherMaterialID) == 0);
@@ -100,12 +91,6 @@ bool LLMaterialID::operator >= (const LLMaterialID& pOtherMaterialID) const
     return (compareToOtherMaterialID(pOtherMaterialID) >= 0);
 }
 
-LLMaterialID& LLMaterialID::operator = (const LLMaterialID& pOtherMaterialID)
-{
-    copyFromOtherMaterialID(pOtherMaterialID);
-    return (*this);
-}
-
 bool LLMaterialID::isNull() const
 {
     return (compareToOtherMaterialID(LLMaterialID::null) == 0);
@@ -168,18 +153,12 @@ std::ostream& operator<<(std::ostream& s, const LLMaterialID &material_id)
     return s;
 }
 
-
 void LLMaterialID::parseFromBinary (const LLSD::Binary& pMaterialID)
 {
     llassert(pMaterialID.size() == (MATERIAL_ID_SIZE * sizeof(U8)));
     memcpy(mID, &pMaterialID[0], MATERIAL_ID_SIZE * sizeof(U8));
 }
 
-void LLMaterialID::copyFromOtherMaterialID(const LLMaterialID& pOtherMaterialID)
-{
-    memcpy(mID, pOtherMaterialID.get(), MATERIAL_ID_SIZE * sizeof(U8));
-}
-
 int LLMaterialID::compareToOtherMaterialID(const LLMaterialID& pOtherMaterialID) const
 {
     int retVal = 0;
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h
index bd6256d961..cec0965441 100644
--- a/indra/llprimitive/llmaterialid.h
+++ b/indra/llprimitive/llmaterialid.h
@@ -39,9 +39,7 @@ public:
     LLMaterialID(const LLSD& pMaterialID);
     LLMaterialID(const LLSD::Binary& pMaterialID);
     LLMaterialID(const void* pMemory);
-    LLMaterialID(const LLMaterialID& pOtherMaterialID);
     LLMaterialID(const LLUUID& lluid);
-    ~LLMaterialID();
 
     bool          operator == (const LLMaterialID& pOtherMaterialID) const;
     bool          operator != (const LLMaterialID& pOtherMaterialID) const;
@@ -51,8 +49,6 @@ public:
     bool          operator > (const LLMaterialID& pOtherMaterialID) const;
     bool          operator >= (const LLMaterialID& pOtherMaterialID) const;
 
-    LLMaterialID& operator = (const LLMaterialID& pOtherMaterialID);
-
     bool          isNull() const;
 
     const U8*     get() const;
@@ -77,7 +73,6 @@ public:
 
 private:
     void parseFromBinary(const LLSD::Binary& pMaterialID);
-    void copyFromOtherMaterialID(const LLMaterialID& pOtherMaterialID);
     int  compareToOtherMaterialID(const LLMaterialID& pOtherMaterialID) const;
 
     U8 mID[MATERIAL_ID_SIZE];
diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp
index 0213a3e8b6..75c3613ece 100644
--- a/indra/llprimitive/tests/llprimitive_test.cpp
+++ b/indra/llprimitive/tests/llprimitive_test.cpp
@@ -71,9 +71,7 @@ private:
     S32 mCurrDetailTest;
 };
 
-LLMaterialID::LLMaterialID() {}
-LLMaterialID::LLMaterialID(LLMaterialID const &m) = default;
-LLMaterialID::~LLMaterialID() {}
+LLMaterialID::LLMaterialID() = default;
 void LLMaterialID::set(void const*) { }
 U8 const * LLMaterialID::get() const { return mID; }