Merge pull request #6193 from secondlife/release/26.4

Release/26.4

1 files changed, 0 insertions, 21 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;