diff options
| author | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
| commit | 07185d300d7879fc4d8d268210fa2c440efe02f4 (patch) | |
| tree | 761fcb3e968339bc04882ea591f56af2fb175187 /indra/llinventory | |
| parent | 8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff) | |
| parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) | |
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index e68331b99a..135d0ca7b9 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -508,6 +508,9 @@ public: { return mRegionDenyAnonymousOverride; } BOOL getRegionDenyAgeUnverifiedOverride() const { return mRegionDenyAgeUnverifiedOverride; } + BOOL getRegionAllowAccessOverride() const + { return mRegionAllowAccessoverride; } + BOOL getAllowGroupAVSounds() const { return mAllowGroupAVSounds; } BOOL getAllowAnyAVSounds() const { return mAllowAnyAVSounds; } @@ -576,6 +579,7 @@ public: void setRegionPushOverride(BOOL override) {mRegionPushOverride = override; } void setRegionDenyAnonymousOverride(BOOL override) { mRegionDenyAnonymousOverride = override; } void setRegionDenyAgeUnverifiedOverride(BOOL override) { mRegionDenyAgeUnverifiedOverride = override; } + void setRegionAllowAccessOverride(BOOL override) { mRegionAllowAccessoverride = override; } // Accessors for parcel sellWithObjects void setPreviousOwnerID(LLUUID prev_owner) { mPreviousOwnerID = prev_owner; } @@ -657,6 +661,7 @@ protected: BOOL mRegionPushOverride; BOOL mRegionDenyAnonymousOverride; BOOL mRegionDenyAgeUnverifiedOverride; + BOOL mRegionAllowAccessoverride; BOOL mAllowGroupAVSounds; BOOL mAllowAnyAVSounds; |