diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
| commit | 14293b7b0a63fe5be904cbdc853f3b185e13f3fc (patch) | |
| tree | 6a755ca689fc408de11e46b891fedb52002b6b9f /indra/llinventory | |
| parent | 71e89d6a493e51789008f74f87439611f11c13ab (diff) | |
| parent | e093a98f86ad46374f5067adb616a2aead73eff5 (diff) | |
Merge remote branch 'develop' into marchcat/xcode-16
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 4 |
1 files changed, 0 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(); |