diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-16 23:45:56 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-16 23:45:56 +0100 |
| commit | 4d4a7dfb9f28007c2ceb53668d065bbe0fa332af (patch) | |
| tree | 9c9929e754fa8f6d0ad6c8fdc15c0fa494dbd0b6 /indra/llinventory/llsettingsbase.cpp | |
| parent | 3116416fcb8dfd54ef2807e9e75959429c946d79 (diff) | |
| parent | 67a16cad8ab5c928f34b4299eae5499b59c3aa83 (diff) | |
Merge and disable new sky render.
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index b763a06ab4..6d2e1f5b78 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -32,6 +32,8 @@ #include "llsdserialize.h" +#pragma optimize("", off) + //========================================================================= namespace { @@ -58,14 +60,16 @@ const F64Seconds LLSettingsBlender::DEFAULT_THRESHOLD(0.01); LLSettingsBase::LLSettingsBase(): mSettings(LLSD::emptyMap()), mDirty(true), - mAssetID() + mAssetID(), + mBlendedFactor(0.0) { } LLSettingsBase::LLSettingsBase(const LLSD setting) : mSettings(setting), mDirty(true), - mAssetID() + mAssetID(), + mBlendedFactor(0.0) { } @@ -228,9 +232,12 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, F break; + case LLSD::TypeUUID: + newSettings[key_name] = value.asUUID(); + break; + // case LLSD::TypeBoolean: // case LLSD::TypeString: -// case LLSD::TypeUUID: // case LLSD::TypeURI: // case LLSD::TypeBinary: // case LLSD::TypeDate: |