diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-10-01 12:44:13 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-10-01 12:44:13 -0700 |
| commit | 002a81ccf5a64fd08e29811a6edea36f2e0408be (patch) | |
| tree | 1ca8b593778d904d5f280aff94be2288d73567af /indra/llinventory | |
| parent | 59ed2d55a1d84ecf879ff564aaf02744f2dc7c7a (diff) | |
| parent | 690f099519e155220535e07539238139b16da99f (diff) | |
Merge remote-tracking branch 'origin/release/2024.09-ExtraFPS' into develop
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(); |