diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-04-18 21:36:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-18 21:36:56 +0300 |
| commit | 9a333e65c4019540d5675e72ac57ef5ab106aab0 (patch) | |
| tree | 55fa0d6d0de4521f0d8f764bb13b2e6c069602bb /indra/llinventory | |
| parent | 3d5f1541dd9980196ba0c8a3c3396c8ed3384d1e (diff) | |
| parent | 4cccf8af43c8ebd9f947b9050a0403f65d0de7ee (diff) | |
Merge develop into release/2025.04
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; |