diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatercreatelandmark.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloatercreatelandmark.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_create_landmark.xml | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index 95ddacbb6c..db84a2ac76 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -216,7 +216,7 @@ void LLFloaterCreateLandmark::onCreateFolderClicked() if (!folder_name.empty()) { inventory_func_type func = boost::bind(&LLFloaterCreateLandmark::folderCreatedCallback, this, _1); - LLUUID test = gInventory.createNewCategory(mLandmarksID, LLFolderType::FT_NONE, folder_name, func); + gInventory.createNewCategory(mLandmarksID, LLFolderType::FT_NONE, folder_name, func); gInventory.notifyObservers(); } } @@ -282,6 +282,8 @@ void LLFloaterCreateLandmark::onSaveClicked() void LLFloaterCreateLandmark::onCancelClicked() { + LLUUID item_id = mItem->getUUID(); + remove_inventory_item(item_id, NULL); closeFloater(); } diff --git a/indra/newview/llfloatercreatelandmark.h b/indra/newview/llfloatercreatelandmark.h index d62ee01790..74ac5e651c 100644 --- a/indra/newview/llfloatercreatelandmark.h +++ b/indra/newview/llfloatercreatelandmark.h @@ -66,7 +66,6 @@ private: LLLineEditor* mLandmarkTitleEditor; LLTextEditor* mNotesEditor; LLUUID mLandmarksID; - LLUUID mItemID; LLLandmarksInventoryObserver* mInventoryObserver; LLPointer<LLInventoryItem> mItem; diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml index 69b019c3a1..dcedaceaeb 100644 --- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml +++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml @@ -4,6 +4,9 @@ show_title="false" can_minimize="false" can_close="false" + header_height="10" + bg_opaque_image="Window_NoTitle_Foreground" + bg_alpha_image="Window_NoTitle_Background" height="305" layout="topleft" name="create_landmark" |