Fix the blend code to record the amount of the blend and to store what is being blended towards.

1 files changed, 8 insertions, 3 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index abe1a1a04a..f2dfeaf154 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -58,14 +58,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)
 {
 }
 
@@ -224,9 +226,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: