diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-15 22:19:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-15 22:19:15 +0300 |
| commit | 06a76eda6af9fbe36e40a749c44e590ad6cfe363 (patch) | |
| tree | 8e269e6e11880d316c9358c6654479c17f644b08 /indra/llinventory | |
| parent | ae931987356a71dbe8fc7ec31f2a2fe9108b4495 (diff) | |
| parent | 293462d8ff6dcb00ec501d026a6589d869a2f846 (diff) | |
Merge branch 'develop' into marchcat/05-develop
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.h | 3 |
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; |