diff options
| author | William Weaver <paperwork.resident@gmail.com> | 2025-03-27 23:58:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-27 23:58:43 +0300 |
| commit | e18577274e393b177d18296f30ef730433a8ba1d (patch) | |
| tree | 0c31aa2d3e7b5b287d40a3d1293add79579d9f2e /indra/llinventory | |
| parent | 76db64e0c8c7dd40ce2a85ef19183c3c245f1dc8 (diff) | |
| parent | 571e33cd5905d62ce210aba5ac1cb1aca4d56de5 (diff) | |
Merge branch 'secondlife:develop' into fix/shadow-resolution-update
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; |