summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingsvo.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-01-08 15:10:25 -0800
committerRider Linden <rider@lindenlab.com>2018-01-08 15:10:25 -0800
commit8211f57205f0008d8ffb9bfcd465ca26d906e19c (patch)
treed5ab9820e70d6828220841141abad38c548759ba /indra/newview/llsettingsvo.h
parent1df10afa2a7802763330475e1a90547c3cff7c06 (diff)
MAINT-7699: Deliver new settings to viewer via cap
Diffstat (limited to 'indra/newview/llsettingsvo.h')
-rw-r--r--indra/newview/llsettingsvo.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h
index 6ef7290ba4..ba96a19d3e 100644
--- a/indra/newview/llsettingsvo.h
+++ b/indra/newview/llsettingsvo.h
@@ -42,6 +42,7 @@ public:
static ptr_t buildDefaultSky();
virtual ptr_t buildClone();
+ static LLSD convertToLegacy(const ptr_t &);
protected:
LLSettingsVOSky();
@@ -63,6 +64,7 @@ public:
static ptr_t buildDefaultWater();
virtual ptr_t buildClone();
+ static LLSD convertToLegacy(const ptr_t &);
protected:
LLSettingsVOWater();
@@ -86,8 +88,11 @@ public:
static ptr_t buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings);
static ptr_t buildFromLegacyMessage(const LLUUID &regionId, LLSD daycycle, LLSD skys, LLSD water);
static ptr_t buildDefaultDayCycle();
+ static ptr_t buildFromEnvironmentMessage(LLSD settings);
virtual ptr_t buildClone();
+ static LLSD convertToLegacy(const ptr_t &);
+
virtual LLSettingsSkyPtr_t getDefaultSky() const;
virtual LLSettingsWaterPtr_t getDefaultWater() const;
virtual LLSettingsSkyPtr_t buildSky(LLSD) const;