diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-16 09:45:23 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-16 09:45:23 -0700 |
| commit | 6b70b8bcdad045c2bded34478d27d048ef558534 (patch) | |
| tree | a90100f864e2c773bed35ab5750c090ff306542b | |
| parent | 68158f0340729d9f7e5a4b3e64bfc154a105ab6c (diff) | |
| parent | aa03fe54cc35cac760a20b5c9e9ab6c84a7b38e5 (diff) | |
Merge
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index cf1d59e514..9222bdbe9e 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -1070,17 +1070,18 @@ void LLFloaterEditExtDayCycle::doApplyCreateNewInventory() // This method knows what sort of settings object to create. LLUUID parent_id = mInventoryItem ? mInventoryItem->getParentUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS); - LLSettingsVOBase::createInventoryItem(mEditDay, parent_id, + // buildClone creates compressed copy + LLSettingsVOBase::createInventoryItem(mEditDay->buildClone(), parent_id, [this](LLUUID asset_id, LLUUID inventory_id, LLUUID, LLSD results) { onInventoryCreated(asset_id, inventory_id, results); }); } void LLFloaterEditExtDayCycle::doApplyUpdateInventory() { if (mInventoryId.isNull()) - LLSettingsVOBase::createInventoryItem(mEditDay, gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS), + LLSettingsVOBase::createInventoryItem(mEditDay->buildClone(), gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS), [this](LLUUID asset_id, LLUUID inventory_id, LLUUID, LLSD results) { onInventoryCreated(asset_id, inventory_id, results); }); else - LLSettingsVOBase::updateInventoryItem(mEditDay, mInventoryId, + LLSettingsVOBase::updateInventoryItem(mEditDay->buildClone(), mInventoryId, [this](LLUUID asset_id, LLUUID inventory_id, LLUUID, LLSD results) { onInventoryUpdated(asset_id, inventory_id, results); }); } @@ -1088,7 +1089,7 @@ void LLFloaterEditExtDayCycle::doApplyEnvironment(const std::string &where) { if (where == ACTION_APPLY_LOCAL) { - LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, mEditDay); + LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, mEditDay->buildClone()); } else if (where == ACTION_APPLY_PARCEL) { @@ -1107,11 +1108,11 @@ void LLFloaterEditExtDayCycle::doApplyEnvironment(const std::string &where) return; } - LLEnvironment::instance().updateParcel(parcel->getLocalID(), mEditDay, -1, -1); + LLEnvironment::instance().updateParcel(parcel->getLocalID(), mEditDay->buildClone(), -1, -1); } else if (where == ACTION_APPLY_REGION) { - LLEnvironment::instance().updateRegion(mEditDay, -1, -1); + LLEnvironment::instance().updateRegion(mEditDay->buildClone(), -1, -1); } else { |