summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingsvo.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-08-16 20:01:48 +0100
committerGraham Linden <graham@lindenlab.com>2018-08-16 20:01:48 +0100
commite3c2d3fd5138fa79946734e61b34d38e98c6a493 (patch)
treea9061a677fb3a8ab1a8816d62ecf4b826db7e5c2 /indra/newview/llsettingsvo.cpp
parentc5b0d4ccd074b7062e5100c3b021da53170eb30c (diff)
parentaa03fe54cc35cac760a20b5c9e9ab6c84a7b38e5 (diff)
Merge
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
-rw-r--r--indra/newview/llsettingsvo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 2cdc3e79c3..b9eb1fd5c6 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -1104,9 +1104,9 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildDeepCloneAndUncompress()
LLSettingsDay::CycleTrack_t track = getCycleTrack(i);
LLSettingsDay::CycleTrack_t::iterator iter = track.begin();
while (iter != track.end())
- {
- // 'Unpack', usually for editing
- // - frames 'share' settings multiple times
+ {
+ // 'Unpack', usually for editing
+ // - frames 'share' settings multiple times
// - settings can reuse LLSDs they were initialized from
// We do not want for edited frame to change multiple frames in same track, so do a clone
day_clone->setSettingsAtKeyframe(iter->second->buildDerivedClone(), iter->first, i);