diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-10-18 19:33:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-10-18 19:33:07 +0800 |
| commit | d353111de315f9d37bf914b54a52d217c45a6e19 (patch) | |
| tree | 6e5cd425872de97080fc1759f981219b0c2d927a /indra/llinventory | |
| parent | ad3cbb9f75c4ea7f0473225afc034c403b54fc82 (diff) | |
| parent | bd19bbf651d5a2b83e367d1f50a3d8eb00d5fbbd (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 4 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index a45ab5a09c..2baf140e6a 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -143,10 +143,6 @@ LLSettingsDay::LLSettingsDay() : //========================================================================= LLSD& LLSettingsDay::getSettings() { - if (mDaySettings.size() > 0) - { - return mDaySettings; - } mDaySettings = LLSD::emptyMap(); LLSD& settings = LLSettingsBase::getSettings(); diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 98825e031f..03beebd9e1 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -1996,6 +1996,7 @@ F32 LLSettingsSky::getCloudShadow() const void LLSettingsSky::setCloudShadow(F32 val) { mCloudShadow = val; + setDirtyFlag(true); setLLSDDirty(); } @@ -2052,6 +2053,7 @@ F32 LLSettingsSky::getMaxY() const void LLSettingsSky::setMaxY(F32 val) { mMaxY = val; + setDirtyFlag(true); setLLSDDirty(); } @@ -2063,6 +2065,7 @@ LLQuaternion LLSettingsSky::getMoonRotation() const void LLSettingsSky::setMoonRotation(const LLQuaternion &val) { mMoonRotation = val; + setDirtyFlag(true); setLLSDDirty(); } @@ -2074,6 +2077,7 @@ F32 LLSettingsSky::getMoonScale() const void LLSettingsSky::setMoonScale(F32 val) { mMoonScale = val; + setDirtyFlag(true); setLLSDDirty(); } @@ -2096,6 +2100,7 @@ F32 LLSettingsSky::getMoonBrightness() const void LLSettingsSky::setMoonBrightness(F32 brightness_factor) { mMoonBrightness = brightness_factor; + setDirtyFlag(true); setLLSDDirty(); } @@ -2132,6 +2137,7 @@ LLColor3 LLSettingsSky::getSunlightColorClamped() const void LLSettingsSky::setSunlightColor(const LLColor3 &val) { mSunlightColor = val; + setDirtyFlag(true); setLLSDDirty(); } @@ -2143,6 +2149,7 @@ LLQuaternion LLSettingsSky::getSunRotation() const void LLSettingsSky::setSunRotation(const LLQuaternion &val) { mSunRotation = val; + setDirtyFlag(true); setLLSDDirty(); } @@ -2154,6 +2161,7 @@ F32 LLSettingsSky::getSunScale() const void LLSettingsSky::setSunScale(F32 val) { mSunScale = val; + setDirtyFlag(true); setLLSDDirty(); } |