From 0b16cd0da40e8064b4ebf6b7fc679c0d710a7346 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 7 Jun 2023 00:13:59 +0300 Subject: SL-19823 Edit not active for items --- indra/newview/llsettingsvo.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llsettingsvo.cpp') diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index b1eed81476..4cfa6f2f85 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -95,6 +95,15 @@ namespace //========================================================================= +void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID& parent_id, std::function created_cb) +{ + inventory_result_fn cb = [created_cb](LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results) + { + created_cb(inventory_id); + }; + createNewInventoryItem(stype, parent_id, cb); +} + void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID &parent_id, inventory_result_fn callback) { LLTransactionID tid; -- cgit v1.2.3 From 19ed999be0d0cb2460e8962824478a6658e026c9 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 13 Jun 2023 16:23:19 +0300 Subject: SL-19858 FIXED Viewer crash when creating a new Setting in inventory --- indra/newview/llsettingsvo.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/newview/llsettingsvo.cpp') diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 4cfa6f2f85..0cfdf67ed5 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -97,10 +97,15 @@ namespace //========================================================================= void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID& parent_id, std::function created_cb) { - inventory_result_fn cb = [created_cb](LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results) + inventory_result_fn cb = NULL; + + if (created_cb != NULL) { - created_cb(inventory_id); - }; + cb = [created_cb](LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results) + { + created_cb(inventory_id); + }; + } createNewInventoryItem(stype, parent_id, cb); } -- cgit v1.2.3