MAINT-8990, MAINT-9002: First pass rework on environment panels, region/parcel

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index beaeac2d04..3356727ee6 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -87,7 +87,7 @@ public:
     inline bool hasSetting(const std::string &param) const { return mSettings.has(param); }
     inline bool isDirty() const { return mDirty; }
     inline bool isVeryDirty() const { return mReplaced; }
-    inline void setDirtyFlag(bool dirty) { mDirty = dirty; }
+    inline void setDirtyFlag(bool dirty) { mDirty = dirty; clearAssetId(); }
 
     size_t getHash() const; // Hash will not include Name, ID or a previously stored Hash
 
@@ -116,10 +116,10 @@ public:
 
     virtual void replaceSettings(LLSD settings)
     {
-        mSettings = settings;
         mBlendedFactor = 0.0;
         setDirtyFlag(true);
         mReplaced = true;
+        mSettings = settings;
     }
 
     virtual LLSD getSettings() const;
@@ -130,8 +130,8 @@ public:
     {
         mSettings[name] = value;
         mDirty = true;
-        if (mSettings.has(SETTING_ASSETID))
-            mSettings.erase(SETTING_ASSETID);
+        if (name != SETTING_ASSETID)
+            clearAssetId();
     }
 
     inline void setValue(const std::string &name, const LLSD &value)