Merge pull request #715 from secondlife/materials_featurette/mirrors

Mirrors pre-release

1 files changed, 13 insertions, 34 deletions

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index f67959de5b..53d09df618 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1825,40 +1825,6 @@ bool LLLightParams::fromLLSD(LLSD& sd)
 
 //============================================================================
 
-LLMirrorParams::LLMirrorParams()
-{
-    mType = PARAMS_MIRROR;
-}
-
-BOOL LLMirrorParams::pack(LLDataPacker &dp) const
-{
-    return TRUE;
-}
-
-BOOL LLMirrorParams::unpack(LLDataPacker &dp)
-{
-    return TRUE;
-}
-
-bool LLMirrorParams::operator==(const LLNetworkData& data) const
-{
-    if (data.mType != PARAMS_REFLECTION_PROBE)
-    {
-        return false;
-    }
-    return true;
-}
-
-void LLMirrorParams::copy(const LLNetworkData& data)
-{
-    const LLMirrorParams *param = (LLMirrorParams*)&data;
-    mType = param->mType;
-}
-
-//============================================================================
-
-//============================================================================
-
 LLReflectionProbeParams::LLReflectionProbeParams()
 {
     mType = PARAMS_REFLECTION_PROBE;
@@ -1968,6 +1934,19 @@ void LLReflectionProbeParams::setIsDynamic(bool is_dynamic)
     }
 }
 
+
+void LLReflectionProbeParams::setIsMirror(bool is_mirror)
+{
+    if (is_mirror)
+    {
+        mFlags |= FLAG_MIRROR;
+    }
+    else
+    {
+        mFlags &= ~FLAG_MIRROR;
+    }
+}
+
 //============================================================================
 LLFlexibleObjectData::LLFlexibleObjectData()
 {