aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llparcel.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llinventory/llparcel.h')
-rw-r--r--linden/indra/llinventory/llparcel.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 1a1205b..2b6eb12 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -244,8 +244,6 @@ public:
244 void setMediaID(const LLUUID& id) { mMediaID = id; } 244 void setMediaID(const LLUUID& id) { mMediaID = id; }
245 void setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; } 245 void setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
246 void setMediaLoop (U8 loop) { mMediaLoop = loop; } 246 void setMediaLoop (U8 loop) { mMediaLoop = loop; }
247 void setObscureMedia( U8 flagIn ) { mObscureMedia = flagIn; }
248 void setObscureMusic( U8 flagIn ) { mObscureMusic = flagIn; }
249 void setMediaWidth(S32 width); 247 void setMediaWidth(S32 width);
250 void setMediaHeight(S32 height); 248 void setMediaHeight(S32 height);
251 void setMediaCurrentURL(const std::string& url); 249 void setMediaCurrentURL(const std::string& url);
@@ -352,8 +350,6 @@ public:
352 U8 getMediaAutoScale() const { return mMediaAutoScale; } 350 U8 getMediaAutoScale() const { return mMediaAutoScale; }
353 U8 getMediaLoop() const { return mMediaLoop; } 351 U8 getMediaLoop() const { return mMediaLoop; }
354 const std::string& getMediaCurrentURL() const { return mMediaCurrentURL; } 352 const std::string& getMediaCurrentURL() const { return mMediaCurrentURL; }
355 U8 getObscureMedia() const { return mObscureMedia; }
356 U8 getObscureMusic() const { return mObscureMusic; }
357 U8 getMediaURLFilterEnable() const { return mMediaURLFilterEnable; } 353 U8 getMediaURLFilterEnable() const { return mMediaURLFilterEnable; }
358 LLSD getMediaURLFilterList() const { return mMediaURLFilterList; } 354 LLSD getMediaURLFilterList() const { return mMediaURLFilterList; }
359 U8 getMediaAllowNavigate() const { return mMediaAllowNavigate; } 355 U8 getMediaAllowNavigate() const { return mMediaAllowNavigate; }
@@ -645,8 +641,6 @@ protected:
645 U8 mMediaAutoScale; 641 U8 mMediaAutoScale;
646 U8 mMediaLoop; 642 U8 mMediaLoop;
647 std::string mMediaCurrentURL; 643 std::string mMediaCurrentURL;
648 U8 mObscureMedia;
649 U8 mObscureMusic;
650 LLUUID mMediaID; 644 LLUUID mMediaID;
651 U8 mMediaURLFilterEnable; 645 U8 mMediaURLFilterEnable;
652 LLSD mMediaURLFilterList; 646 LLSD mMediaURLFilterList;