diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-08-26 11:43:45 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-08-26 11:43:45 -0700 |
| commit | 1f656735d339fc4d83da86efbb400af1361c27db (patch) | |
| tree | da05e8dbe4bbcbaf1c248df9799534e546123897 /indra/llinventory | |
| parent | 98d926afd7fba39cac373a89705851ad8bb2258e (diff) | |
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 7 | ||||
| -rw-r--r-- | indra/llinventory/llsettingsbase.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index e8fdd017e3..af3e84fd0f 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -59,6 +59,7 @@ const std::string LLSettingsBase::SETTING_FLAGS("flags"); const U32 LLSettingsBase::FLAG_NOCOPY(0x01 << 0); const U32 LLSettingsBase::FLAG_NOMOD(0x01 << 1); const U32 LLSettingsBase::FLAG_NOTRANS(0x01 << 2); +const U32 LLSettingsBase::FLAG_NOSAVE(0x01 << 3); const U32 LLSettingsBase::Validator::VALIDATION_PARTIAL(0x01 << 0); @@ -354,7 +355,11 @@ LLSD LLSettingsBase::getSettings() const LLSD LLSettingsBase::cloneSettings() const { - return combineSDMaps(getSettings(), LLSD()); + U32 flags = getFlags(); + LLSD settings (combineSDMaps(getSettings(), LLSD())); + if (flags) + settings[SETTING_FLAGS] = LLSD::Integer(flags); + return settings; } size_t LLSettingsBase::getHash() const diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index afb5014409..8b969d81a6 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -75,6 +75,7 @@ public: static const U32 FLAG_NOCOPY; static const U32 FLAG_NOMOD; static const U32 FLAG_NOTRANS; + static const U32 FLAG_NOSAVE; class DefaultParam { |