summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingsdaycycle.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-15 13:37:54 -0700
committerRider Linden <rider@lindenlab.com>2018-08-15 13:37:54 -0700
commitd4aa55eade93a451149f906fe9187235306e8343 (patch)
tree88a726175a8de7efb4d7d3e6e006c75b458a003f /indra/llinventory/llsettingsdaycycle.cpp
parenteadf0b910174274e7c83fe37e417f576a7350edb (diff)
parentf028ddd0754d5a2fd2f2300aa02eff4fe6cfa96f (diff)
Merge
Diffstat (limited to 'indra/llinventory/llsettingsdaycycle.cpp')
-rw-r--r--indra/llinventory/llsettingsdaycycle.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index 20efb23607..364ff570ed 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -377,12 +377,7 @@ bool LLSettingsDay::initialize(bool validate_frames)
}
}
}
-
- // 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();
+ mDayTracks[i][keyframe] = setting;
}
}
}