diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-05-27 02:17:39 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-05-27 02:17:39 +0300 |
| commit | 7d726d1b4aa3e572c9a52788ad48f5807560be8d (patch) | |
| tree | 655c2e736d4c968aa94f594ac9ea7fdf4acc4371 /indra | |
| parent | 242ae3e073273fcb6ccc3d02c187c799f20fed96 (diff) | |
SL-15319 FIXED Crash in LLFloaterCreateLandmark::onCancelClicked
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatercreatelandmark.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index db84a2ac76..eb93a6a75a 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -231,7 +231,11 @@ void LLFloaterCreateLandmark::folderCreatedCallback(LLUUID folder_id) void LLFloaterCreateLandmark::onSaveClicked() { if (mItem.isNull()) + { + closeFloater(); return; + } + std::string current_title_value = mLandmarkTitleEditor->getText(); std::string item_title_value = mItem->getName(); @@ -282,8 +286,11 @@ void LLFloaterCreateLandmark::onSaveClicked() void LLFloaterCreateLandmark::onCancelClicked() { - LLUUID item_id = mItem->getUUID(); - remove_inventory_item(item_id, NULL); + if (!mItem.isNull()) + { + LLUUID item_id = mItem->getUUID(); + remove_inventory_item(item_id, NULL); + } closeFloater(); } |