SL-19858 FIXED Viewer crash when creating a new Setting in inventory

1 files changed, 8 insertions, 3 deletions

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<void(const LLUUID&)> 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);
 }