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.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 10fe6dc..9c91d94 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -211,8 +211,15 @@ public:
211 void setDesc(const LLString& desc); 211 void setDesc(const LLString& desc);
212 void setMusicURL(const LLString& url); 212 void setMusicURL(const LLString& url);
213 void setMediaURL(const LLString& url); 213 void setMediaURL(const LLString& url);
214 void setMediaType(const char* type);
215 void setMediaDesc(const char* desc);
214 void setMediaID(const LLUUID& id) { mMediaID = id; } 216 void setMediaID(const LLUUID& id) { mMediaID = id; }
215 void setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; } 217 void setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
218 void setMediaLoop (U8 loop) { mMediaLoop = loop; }
219 void setObscureMedia( U8 flagIn ) { mObscureMedia = flagIn; }
220 void setObscureMusic( U8 flagIn ) { mObscureMusic = flagIn; }
221 void setMediaWidth(S32 width);
222 void setMediaHeight(S32 height);
216 virtual void setLocalID(S32 local_id); 223 virtual void setLocalID(S32 local_id);
217 224
218 // blow away all the extra crap lurking in parcels, including urls, access lists, etc 225 // blow away all the extra crap lurking in parcels, including urls, access lists, etc
@@ -268,6 +275,7 @@ public:
268 BOOL exportStream(std::ostream& output_stream); 275 BOOL exportStream(std::ostream& output_stream);
269 276
270 void packMessage(LLMessageSystem* msg); 277 void packMessage(LLMessageSystem* msg);
278 void packMessage(LLSD& msg);
271 void unpackMessage(LLMessageSystem* msg); 279 void unpackMessage(LLMessageSystem* msg);
272 280
273 void packAccessEntries(LLMessageSystem* msg, 281 void packAccessEntries(LLMessageSystem* msg,
@@ -299,8 +307,15 @@ public:
299 const LLString& getDesc() const { return mDesc; } 307 const LLString& getDesc() const { return mDesc; }
300 const LLString& getMusicURL() const { return mMusicURL; } 308 const LLString& getMusicURL() const { return mMusicURL; }
301 const LLString& getMediaURL() const { return mMediaURL; } 309 const LLString& getMediaURL() const { return mMediaURL; }
310 const char* getMediaDesc() const { return mMediaDesc.c_str(); }
311 const char* getMediaType() const { return mMediaType.c_str(); }
302 const LLUUID& getMediaID() const { return mMediaID; } 312 const LLUUID& getMediaID() const { return mMediaID; }
313 S32 getMediaWidth() const { return mMediaWidth; }
314 S32 getMediaHeight() const { return mMediaHeight; }
303 U8 getMediaAutoScale() const { return mMediaAutoScale; } 315 U8 getMediaAutoScale() const { return mMediaAutoScale; }
316 U8 getMediaLoop() const { return mMediaLoop; }
317 U8 getObscureMedia() const { return mObscureMedia; }
318 U8 getObscureMusic() const { return mObscureMusic; }
304 S32 getLocalID() const { return mLocalID; } 319 S32 getLocalID() const { return mLocalID; }
305 const LLUUID& getOwnerID() const { return mOwnerID; } 320 const LLUUID& getOwnerID() const { return mOwnerID; }
306 const LLUUID& getGroupID() const { return mGroupID; } 321 const LLUUID& getGroupID() const { return mGroupID; }
@@ -576,7 +591,14 @@ protected:
576 LLString mDesc; 591 LLString mDesc;
577 LLString mMusicURL; 592 LLString mMusicURL;
578 LLString mMediaURL; 593 LLString mMediaURL;
594 std::string mMediaDesc;
595 std::string mMediaType;
596 S32 mMediaWidth;
597 S32 mMediaHeight;
579 U8 mMediaAutoScale; 598 U8 mMediaAutoScale;
599 U8 mMediaLoop;
600 U8 mObscureMedia;
601 U8 mObscureMusic;
580 LLUUID mMediaID; 602 LLUUID mMediaID;
581 S32 mPassPrice; 603 S32 mPassPrice;
582 F32 mPassHours; 604 F32 mPassHours;