From 98862a53a77cd1ce9a2cae596a743669cc32a2af Mon Sep 17 00:00:00 2001 From: "Graham Linden graham@lindenlab.com" Date: Sat, 3 Mar 2018 00:53:39 +0000 Subject: Fix 16F enum for compat w/ SL gl headers on Mac. Make density profile/layer parsing handle when LLSD heard you liked arrays so it put an array in your array. --- indra/newview/llsettingsvo.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/llsettingsvo.h') diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 7f8dc40c36..48b5cad168 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -79,7 +79,7 @@ private: class LLSettingsVOSky : public LLSettingsSky { public: - LLSettingsVOSky(const LLSD &data); + LLSettingsVOSky(const LLSD &data, bool advanced = false); static ptr_t buildSky(LLSD settings); @@ -87,7 +87,10 @@ public: static ptr_t buildDefaultSky(); virtual ptr_t buildClone() override; - static LLSD convertToLegacy(const ptr_t &); + static LLSD convertToLegacy(const ptr_t &, bool isAdvanced); + + bool isAdvanced() const { return m_isAdvanced; } + protected: LLSettingsVOSky(); @@ -97,6 +100,7 @@ protected: virtual parammapping_t getParameterMap() const override; + bool m_isAdvanced = false; }; //========================================================================= -- cgit v1.2.3