summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.h
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-05-02 16:35:55 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-05-02 16:35:55 -0700
commit9bfae21706288802f94d642eb252ac78b4d9e85c (patch)
treefe02b30f05ba6a515212e35a018e97a81a27dfed /indra/llinventory/llparcel.h
parentf393774caf49313f24d33cb2b33b6ad92c70977f (diff)
ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by Kelly
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r--indra/llinventory/llparcel.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 71b65d99ce..4d2236ec66 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -75,7 +75,7 @@ const U8 PARCEL_AUCTION = 0x05;
// unused 0x06
// unused 0x07
// flag, unused 0x08
-// flag, unused 0x10
+const U8 PARCEL_PRIVATE = 0x10;
const U8 PARCEL_SOUND_LOCAL = 0x20;
const U8 PARCEL_WEST_LINE = 0x40; // flag, property line on west edge
const U8 PARCEL_SOUTH_LINE = 0x80; // flag, property line on south edge
@@ -130,6 +130,12 @@ class LLSD;
class LLAccessEntry
{
public:
+ LLAccessEntry()
+ : mID(),
+ mTime(0),
+ mFlags(0)
+ {}
+
LLUUID mID; // Agent ID
S32 mTime; // Time (unix seconds) when entry expires
U32 mFlags; // Not used - currently should always be zero
@@ -265,6 +271,7 @@ public:
void setUserLocation(const LLVector3& pos) { mUserLocation = pos; }
void setUserLookAt(const LLVector3& rot) { mUserLookAt = rot; }
void setLandingType(const ELandingType type) { mLandingType = type; }
+ void setPrivacy(bool privacy) { mPrivacy = privacy; }
void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
@@ -367,6 +374,8 @@ public:
const LLVector3& getUserLocation() const { return mUserLocation; }
const LLVector3& getUserLookAt() const { return mUserLookAt; }
ELandingType getLandingType() const { return mLandingType; }
+ bool getPrivacy() const { return mPrivacy; }
+
// User-specified snapshot
const LLUUID& getSnapshotID() const { return mSnapshotID; }
@@ -602,6 +611,7 @@ protected:
LLVector3 mUserLocation;
LLVector3 mUserLookAt;
ELandingType mLandingType;
+ bool mPrivacy;
LLTimer mSaleTimerExpires;
LLTimer mMediaResetTimer;