2 files changed, 2 insertions, 16 deletions

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 39605eb..4cbb83a 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -195,8 +195,6 @@ void LLParcel::init(const LLUUID &owner_id,
         mMediaID.setNull();
         mMediaAutoScale = 0;
         mMediaLoop = TRUE;
-        mObscureMedia = 1;
-        mObscureMusic = 1;
         mMediaWidth = 0;
         mMediaHeight = 0;
         setMediaCurrentURL(LLStringUtil::null);
@@ -691,8 +689,8 @@ void LLParcel::packMessage(LLSD& msg)
         msg["auto_scale"] = getMediaAutoScale();
         msg["media_loop"] = getMediaLoop();
         msg["media_current_url"] = getMediaCurrentURL();
-        msg["obscure_media"] = getObscureMedia();
-        msg["obscure_music"] = getObscureMusic();
+        msg["obscure_media"] = FALSE; // OBSOLETE - no longer used
+        msg["obscure_music"] = FALSE; // OBSOLETE - no longer used
         msg["media_id"] = getMediaID();
         msg["media_allow_navigate"] = getMediaAllowNavigate();
         msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom();
@@ -757,8 +755,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
                 msg->getS32("MediaData", "MediaWidth", mMediaWidth);
                 msg->getS32("MediaData", "MediaHeight", mMediaHeight);
                 msg->getU8 ( "MediaData", "MediaLoop", mMediaLoop );
-                msg->getU8 ( "MediaData", "ObscureMedia", mObscureMedia );
-                msg->getU8 ( "MediaData", "ObscureMusic", mObscureMusic );
         }
         else
         {
@@ -766,8 +762,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
                                                 // thats what we want -- AW
                 setMediaDesc(std::string("No Description available without Server Upgrade"));
                 mMediaLoop = true;
-                mObscureMedia = true;
-                mObscureMusic = true;
         }
 
         if(msg->getNumberOfBlocks("MediaLinkSharing") > 0)
@@ -1233,8 +1227,6 @@ void LLParcel::clearParcel()
     setMediaDesc(LLStringUtil::null);
         setMediaAutoScale(0);
         setMediaLoop(TRUE);
-        mObscureMedia = 1;
-        mObscureMusic = 1;
         mMediaWidth = 0;
         mMediaHeight = 0;
         setMediaCurrentURL(LLStringUtil::null);
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index f102ec4..52f97de 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -244,8 +244,6 @@ public:
         void    setMediaID(const LLUUID& id) { mMediaID = id; }
         void    setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
         void    setMediaLoop (U8 loop) { mMediaLoop = loop; }
-        void    setObscureMedia( U8 flagIn ) { mObscureMedia = flagIn; }
-        void    setObscureMusic( U8 flagIn ) { mObscureMusic = flagIn; }
         void setMediaWidth(S32 width);
         void setMediaHeight(S32 height);
         void setMediaCurrentURL(const std::string& url);
@@ -352,8 +350,6 @@ public:
         U8                              getMediaAutoScale() const       { return mMediaAutoScale; }
         U8              getMediaLoop() const        { return mMediaLoop; }
         const std::string&  getMediaCurrentURL() const { return mMediaCurrentURL; }
-        U8                              getObscureMedia() const         { return mObscureMedia; }
-        U8                              getObscureMusic() const         { return mObscureMusic; }
         U8              getMediaURLFilterEnable() const   { return mMediaURLFilterEnable; }
         LLSD            getMediaURLFilterList() const     { return mMediaURLFilterList; }
         U8              getMediaAllowNavigate() const { return mMediaAllowNavigate; }
@@ -645,8 +641,6 @@ protected:
         U8                                      mMediaAutoScale;
         U8                  mMediaLoop;
         std::string         mMediaCurrentURL;
-        U8                                      mObscureMedia;
-        U8                                      mObscureMusic;
         LLUUID                          mMediaID;
         U8                  mMediaURLFilterEnable;
         LLSD                mMediaURLFilterList;