diff options
author | Rider Linden <rider@lindenlab.com> | 2018-08-15 13:37:54 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-08-15 13:37:54 -0700 |
commit | d4aa55eade93a451149f906fe9187235306e8343 (patch) | |
tree | 88a726175a8de7efb4d7d3e6e006c75b458a003f /indra/newview/llsettingsvo.h | |
parent | eadf0b910174274e7c83fe37e417f576a7350edb (diff) | |
parent | f028ddd0754d5a2fd2f2300aa02eff4fe6cfa96f (diff) |
Merge
Diffstat (limited to 'indra/newview/llsettingsvo.h')
-rw-r--r-- | indra/newview/llsettingsvo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 789739e5af..65aba42fbe 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -159,6 +159,7 @@ public: static ptr_t buildFromEnvironmentMessage(LLSD settings); static void buildFromOtherSetting(LLSettingsBase::ptr_t settings, asset_built_fn cb); virtual ptr_t buildClone() override; + virtual ptr_t buildDeepCloneAndUncompress(); static LLSD convertToLegacy(const ptr_t &); |