From 423df2ba4b731417796478c449e3e8f3d166ef21 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <leviathan@lindenlab.com>
Date: Fri, 21 Mar 2025 07:18:13 -0700
Subject: prevent erroneous edit of wrong parcel  (#3759)

* prevent erroneous edit of wrong parcel

Fixes jira-archive-internal/issues/70771
[SL-20409] Erroneous Local Parcel Twins -
Parcel Updates Across Region Borders -
unrequested updateDatabaseParcel changes

* remove unused argument in sendParcelPropertiesUpdate()
---
 indra/llinventory/llparcel.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llinventory')

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;
-- 
cgit v1.2.3


From 206f8d9e01aeadd972d2b279a5e111e0fb418987 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 15 Apr 2025 20:04:38 +0300
Subject: #3863 Ensure cloud texture selection updates the sky

---
 indra/llinventory/llsettingsbase.h  | 2 +-
 indra/llinventory/llsettingssky.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 7de71588ef..bea6fdec97 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -398,7 +398,7 @@ protected:
 
 private:
     bool        mLLSDDirty;
-    bool        mDirty;
+    bool        mDirty; // gates updateSettings
     bool        mReplaced; // super dirty!
 
     static LLSD combineSDMaps(const LLSD &first, const LLSD &other);
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index ff28c30563..e7d2887fdb 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1932,6 +1932,7 @@ LLUUID LLSettingsSky::getCloudNoiseTextureId() const
 void LLSettingsSky::setCloudNoiseTextureId(const LLUUID &id)
 {
     mCloudTextureId = id;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -1976,6 +1977,7 @@ LLVector2 LLSettingsSky::getCloudScrollRate() const
 void LLSettingsSky::setCloudScrollRate(const LLVector2 &val)
 {
     mScrollRate = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2134,6 +2136,7 @@ LLUUID LLSettingsSky::getMoonTextureId() const
 void LLSettingsSky::setMoonTextureId(LLUUID id)
 {
     mMoonTextureId = id;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2218,6 +2221,7 @@ LLUUID LLSettingsSky::getSunTextureId() const
 void LLSettingsSky::setSunTextureId(LLUUID id)
 {
     mSunTextureId = id;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
-- 
cgit v1.2.3