6 files changed, 45 insertions, 37 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index b45ead92d3..703584ed62 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -404,11 +404,6 @@ S32  LLPrimitive::setTEFullbright(const U8 index, const U8 fullbright)
 	return mTextureList.setFullbright(index, fullbright);
 }
 
-S32 LLPrimitive::setTERenderableTarget(const U8 te, const LLTextureEntry::eRenderableTarget target)
-{
-    return mTextureList.setRenderableTarget(te, target);
-}
-
 S32  LLPrimitive::setTEMediaFlags(const U8 index, const U8 media_flags)
 {
 	return mTextureList.setMediaFlags(index, media_flags);
@@ -1828,6 +1823,40 @@ 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;
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
index 520c7c7ac8..1af9bca42e 100644
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@@ -109,6 +109,7 @@ public:
         PARAMS_EXTENDED_MESH = 0x70,
         PARAMS_RENDER_MATERIAL = 0x80,
         PARAMS_REFLECTION_PROBE = 0x90,
+        PARAMS_MIRROR = 0x100,
 	};
 	
 public:
@@ -172,6 +173,16 @@ public:
 	F32 getCutoff() const					{ return mCutoff; }
 };
 
+class LLMirrorParams : public LLNetworkData
+{
+public:
+    LLMirrorParams();
+    /*virtual*/ BOOL pack(LLDataPacker &dp) const;
+    /*virtual*/ BOOL unpack(LLDataPacker &dp);
+    /*virtual*/ bool operator==(const LLNetworkData& data) const;
+    /*virtual*/ void copy(const LLNetworkData& data);
+};
+
 extern const F32 REFLECTION_PROBE_MIN_AMBIANCE;
 extern const F32 REFLECTION_PROBE_MAX_AMBIANCE;
 extern const F32 REFLECTION_PROBE_DEFAULT_AMBIANCE;
@@ -485,7 +496,6 @@ public:
 	virtual S32 setTETexGen(const U8 te, const U8 texgen);
 	virtual S32 setTEShiny(const U8 te, const U8 shiny);
 	virtual S32 setTEFullbright(const U8 te, const U8 fullbright);
-    virtual S32 setTERenderableTarget(const U8 te, const LLTextureEntry::eRenderableTarget target);
 	virtual S32 setTEMediaFlags(const U8 te, const U8 flags);
 	virtual S32 setTEGlow(const U8 te, const F32 glow);
 	virtual S32 setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID);
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index 49b59e35cb..f4f08248b8 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -341,16 +341,6 @@ S32 LLPrimTextureList::setFullbright(const U8 index, const U8 fullbright)
 	return TEM_CHANGE_NONE;
 }
 
-S32 LLPrimTextureList::setRenderableTarget(const U8 index, const U8 target)
-{
-    if (index < mEntryList.size())
-    {
-        return mEntryList[index]->setRenderableTarget((LLTextureEntry::eRenderableTarget)target);
-    }
-    
-    return TEM_CHANGE_NONE;
-}
-
 S32 LLPrimTextureList::setMediaFlags(const U8 index, const U8 media_flags)
 {
 	if (index < mEntryList.size())
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h
index 34b87d879f..49c636e40f 100644
--- a/indra/llprimitive/llprimtexturelist.h
+++ b/indra/llprimitive/llprimtexturelist.h
@@ -102,7 +102,6 @@ public:
 	S32 setTexGen(const U8 index, const U8 texgen);
 	S32 setShiny(const U8 index, const U8 shiny);
 	S32 setFullbright(const U8 index, const U8 t);
-    S32 setRenderableTarget(const U8 index, const U8 target);
 	S32 setMediaFlags(const U8 index, const U8 media_flags);
 	S32 setGlow(const U8 index, const F32 glow);
 	S32 setMaterialID(const U8 index, const LLMaterialID& pMaterialID);
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index fdf3774bfa..ee2a4c769a 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -504,16 +504,6 @@ S32 LLTextureEntry::setFullbright(U8 fullbright)
 	return TEM_CHANGE_NONE;
 }
 
-S32 LLTextureEntry::setRenderableTarget(eRenderableTarget target)
-{
-    if (getRenderableTarget() != target) {
-        mRenderableTarget = target;
-        return TEM_CHANGE_TEXTURE;
-    }
-    
-    return TEM_CHANGE_NONE;
-}
-
 S32 LLTextureEntry::setShiny(U8 shiny)
 {
 	shiny &= TEM_SHINY_MASK;
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 2c0832e1d4..0935147688 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -80,12 +80,6 @@ public:
 		TEX_GEN_SPHERICAL		= 0x04,
 		TEX_GEN_CYLINDRICAL		= 0x06
 	} eTexGen;
-    
-    
-    typedef enum e_renderable_target {
-        RT_DISABLED = 0x00,
-        RT_MIRROR = 0x02
-    } eRenderableTarget;
 
 	LLTextureEntry();
 	LLTextureEntry(const LLUUID& tex_id);
@@ -141,8 +135,6 @@ public:
 	S32  setMaterialID(const LLMaterialID& pMaterialID);
 	S32  setMaterialParams(const LLMaterialPtr pMaterialParams);
     
-    S32  setRenderableTarget(eRenderableTarget target);
-    
 	virtual const LLUUID &getID() const { return mID; }
 	const LLColor4 &getColor() const { return mColor; }
     const F32 getAlpha() const { return mColor.mV[VALPHA]; }
@@ -160,7 +152,6 @@ public:
 
 	U8	 getBumpmap() const { return mBump & TEM_BUMP_MASK; }
 	U8	 getFullbright() const { return (mBump>>TEM_FULLBRIGHT_SHIFT) & TEM_FULLBRIGHT_MASK; }
-    eRenderableTarget getRenderableTarget() const { return mRenderableTarget; }
 	U8	 getShiny() const { return (mBump>>TEM_SHINY_SHIFT) & TEM_SHINY_MASK; }
 	U8	 getBumpShiny() const { return mBump & TEM_BUMP_SHINY_MASK; }
  	U8	 getBumpShinyFullbright() const { return mBump; }
@@ -242,7 +233,6 @@ protected:
 	LLColor4			mColor;
 	U8					mBump;					// Bump map, shiny, and fullbright
 	U8					mMediaFlags;			// replace with web page, movie, etc.
-    eRenderableTarget   mRenderableTarget;
 	F32                 mGlow;
 	bool                mMaterialUpdatePending;
 	LLMaterialID        mMaterialID;