diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/llinventory/llparcel.h | |
parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) |
merge changes for storm-1016
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r-- | indra/llinventory/llparcel.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 751e2deb84..71b65d99ce 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -239,8 +239,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); @@ -347,8 +345,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; } @@ -637,8 +633,6 @@ protected: U8 mMediaAutoScale; U8 mMediaLoop; std::string mMediaCurrentURL; - U8 mObscureMedia; - U8 mObscureMusic; LLUUID mMediaID; U8 mMediaURLFilterEnable; LLSD mMediaURLFilterList; |