From b465a5bf6f4f63026ff66bfee4671584c47c4119 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 22 Jan 2019 16:53:14 -0800
Subject: SL-10387: Inject individual settings.  Still freezes parcel/region
 settings.

---
 indra/llinventory/llsettingssky.h   | 16 ++++++++--------
 indra/llinventory/llsettingswater.h |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index a09dcd2008..e82ab8db0c 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -115,7 +115,7 @@ public:
 
     // Settings status 
     virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) SETTINGS_OVERRIDE;
-    
+
     virtual void replaceSettings(LLSD settings) SETTINGS_OVERRIDE;
 
     void replaceWithSky(LLSettingsSky::ptr_t pother);
@@ -322,6 +322,13 @@ protected:
     virtual stringset_t getSlerpKeys() const SETTINGS_OVERRIDE;
     virtual stringset_t getSkipInterpolateKeys() const SETTINGS_OVERRIDE;
 
+    LLUUID      mNextSunTextureId;
+    LLUUID      mNextMoonTextureId;
+    LLUUID      mNextCloudTextureId;
+    LLUUID      mNextBloomTextureId;
+    LLUUID      mNextRainbowTextureId;
+    LLUUID      mNextHaloTextureId;
+
 private:
     static LLSD rayleighConfigDefault();
     static LLSD absorptionConfigDefault();
@@ -344,13 +351,6 @@ private:
     mutable LLColor3    mSunDiffuse;
     mutable LLColor4    mTotalAmbient;
 
-    LLUUID      mNextSunTextureId;
-    LLUUID      mNextMoonTextureId;
-    LLUUID      mNextCloudTextureId;
-    LLUUID      mNextBloomTextureId;
-    LLUUID      mNextRainbowTextureId;
-    LLUUID      mNextHaloTextureId;
-
     typedef std::map<std::string, S32> mapNameToUniformId_t;
 
     static mapNameToUniformId_t sNameToUniformMapping;
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h
index 118c515743..9998f64fd6 100644
--- a/indra/llinventory/llsettingswater.h
+++ b/indra/llinventory/llsettingswater.h
@@ -239,9 +239,9 @@ protected:
 
     LLSettingsWater();
 
-private:
     LLUUID    mNextTransparentTextureID;
     LLUUID    mNextNormalMapID;
+
 };
 
 #endif
-- 
cgit v1.2.3