summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingsbase.cpp
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2024-08-29 15:43:01 +0200
committerGuru <alexandrgproductengine@lindenlab.com>2024-08-30 00:55:32 +0200
commit17fed3985f56033f6c433436935cfde32ea1e7c6 (patch)
tree5afdcc0a16ac485d4878ab9b9e399da8a55aa806 /indra/llinventory/llsettingsbase.cpp
parentecf3002a4623ebed0ed31bcc11f743000deeac84 (diff)
#2360 Incorrect Day Cycle name in Edit Day Cycle floater (remove unused key CANMOD)
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
-rw-r--r--indra/llinventory/llsettingsbase.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 7b55fbc9e8..4aab3dee3b 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -355,10 +355,11 @@ LLSD LLSettingsBase::getSettings() const
LLSD LLSettingsBase::cloneSettings() const
{
- U32 flags = getFlags();
- LLSD settings (combineSDMaps(getSettings(), LLSD()));
- if (flags)
+ LLSD settings(combineSDMaps(getSettings(), LLSD()));
+ if (U32 flags = getFlags())
+ {
settings[SETTING_FLAGS] = LLSD::Integer(flags);
+ }
return settings;
}