summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-06 20:16:49 +0000
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-06 20:16:49 +0000
commit6e51714419a151dcc26e04319cc554187a905279 (patch)
tree04126f125c26e7e7c2664d64989910314c32317c /indra/llinventory
parent1d522aca8a5d5205f6d6150699ce5b9b8425c007 (diff)
Isolate atmospherics LLSD conversion code.
Fix translateLegacySettings to add an array where an array is expected.
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingssky.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 5d38deb229..cac363b510 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -616,17 +616,17 @@ LLSD LLSettingsSky::translateLegacySettings(LLSD legacy)
if (!legacy.has(SETTING_RAYLEIGH_CONFIG))
{
- newsettings[SETTING_RAYLEIGH_CONFIG] = rayleighConfigDefault();
+ newsettings[SETTING_RAYLEIGH_CONFIG].append(rayleighConfigDefault());
}
if (!legacy.has(SETTING_ABSORPTION_CONFIG))
{
- newsettings[SETTING_ABSORPTION_CONFIG] = absorptionConfigDefault();
+ newsettings[SETTING_ABSORPTION_CONFIG].append(absorptionConfigDefault());
}
if (!legacy.has(SETTING_MIE_CONFIG))
{
- newsettings[SETTING_MIE_CONFIG] = mieConfigDefault();
+ newsettings[SETTING_MIE_CONFIG].append(mieConfigDefault());
}
if (legacy.has(SETTING_CLOUD_COLOR))
@@ -728,8 +728,6 @@ LLSD LLSettingsSky::translateLegacySettings(LLSD legacy)
newsettings[SETTING_SUN_ARC_RADIANS] = 0.00935f / 2.0f;
}
-
-
if (legacy.has(SETTING_LEGACY_EAST_ANGLE) && legacy.has(SETTING_LEGACY_SUN_ANGLE))
{ // convert the east and sun angles into a quaternion.
F32 azimuth = legacy[SETTING_LEGACY_EAST_ANGLE].asReal();