Merge

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index a43eae16fe..ff9614fb10 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -262,7 +262,12 @@ bool LLSettingsDay::initialize()
                     haswater |= true;
                 else
                     hassky |= true;
-                mDayTracks[i][keyframe] = setting;
+
+                // Build clone since:
+                // - can use settings from "used" multiple times
+                // - settings can reuse LLSDs they were initialized from
+                // - LLSDs are 'smart' and can reuse them self multiple times
+                mDayTracks[i][keyframe] = setting->buildDerivedClone();
             }
         }
     }