diff options
author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-03 00:53:39 +0000 |
---|---|---|
committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-03 00:53:39 +0000 |
commit | 98862a53a77cd1ce9a2cae596a743669cc32a2af (patch) | |
tree | 09838f73b2b7ecaabb88a9839b343ac0f6b68aa7 /indra/newview/llsettingsvo.h | |
parent | acdead96cd194040f586c5a6e976beca7bb999c4 (diff) |
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.
Diffstat (limited to 'indra/newview/llsettingsvo.h')
-rw-r--r-- | indra/newview/llsettingsvo.h | 8 |
1 files changed, 6 insertions, 2 deletions
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; }; //========================================================================= |