summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2025-04-18 20:44:34 +0300
committerGitHub <noreply@github.com>2025-04-18 20:44:34 +0300
commit11cd9b91a2cf3e71cb6dae0a08dff2b878163ce8 (patch)
treec5fed987eeece9706957ecb3e47559e4a89f4923 /indra/llinventory
parentd3d8513c3b5a7f25adac777d9d59896d8dbd14c0 (diff)
parent1c3ce46d34293f0e1dc5887ef98b05921af663c9 (diff)
Merge pull request #3914 from secondlife/marchcat/05-develop
develop → 2025.05 sync
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llparcel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 67d713db1f..759638b956 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -262,6 +262,8 @@ public:
void setMediaURLResetTimer(F32 time);
virtual void setLocalID(S32 local_id);
+ void setRegionID(const LLUUID& id) { mRegionID = id; }
+ const LLUUID& getRegionID() const { return mRegionID; }
// blow away all the extra stuff lurking in parcels, including urls, access lists, etc
void clearParcel();
@@ -651,6 +653,7 @@ public:
S32 mLocalID;
LLUUID mBanListTransactionID;
LLUUID mAccessListTransactionID;
+ LLUUID mRegionID;
std::map<LLUUID,LLAccessEntry> mAccessList;
std::map<LLUUID,LLAccessEntry> mBanList;
std::map<LLUUID,LLAccessEntry> mTempBanList;