From efc8b268a2686a86c0975b4b3f67ef821a416d98 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 30 Jun 2021 23:19:47 +0300 Subject: SL-15434 Change default landmark destination --- indra/newview/llfloatercreatelandmark.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatercreatelandmark.cpp') diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index eb93a6a75a..813b7ceec8 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -143,7 +143,7 @@ void LLFloaterCreateLandmark::setLandmarkInfo(const LLUUID &folder_id) mLandmarkTitleEditor->setText(name); } - LLLandmarkActions::createLandmarkHere(name, "", folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE)); + LLLandmarkActions::createLandmarkHere(name, "", folder_id.notNull() ? folder_id : mLandmarksID); } bool cmp_folders(const folder_pair_t& left, const folder_pair_t& right) @@ -202,6 +202,10 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) { mFolderCombo->setCurrentByID(folder_id); } + else + { + mFolderCombo->setCurrentByID(mLandmarksID); + } } void LLFloaterCreateLandmark::onCreateFolderClicked() @@ -320,4 +324,4 @@ void LLFloaterCreateLandmark::setItem(const uuid_set_t& items) } } } -} \ No newline at end of file +} -- cgit v1.2.3 From 35f2b14c1d734382a2184d6d5c0794cb558dcc42 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 13 Jul 2021 00:04:23 +0300 Subject: Revert "SL-15434 Change default landmark destination" This reverts commit efc8b268a2686a86c0975b4b3f67ef821a416d98. --- indra/newview/llfloatercreatelandmark.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'indra/newview/llfloatercreatelandmark.cpp') diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index 813b7ceec8..6b1d9306fb 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -143,7 +143,7 @@ void LLFloaterCreateLandmark::setLandmarkInfo(const LLUUID &folder_id) mLandmarkTitleEditor->setText(name); } - LLLandmarkActions::createLandmarkHere(name, "", folder_id.notNull() ? folder_id : mLandmarksID); + LLLandmarkActions::createLandmarkHere(name, "", folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE)); } bool cmp_folders(const folder_pair_t& left, const folder_pair_t& right) @@ -202,10 +202,6 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) { mFolderCombo->setCurrentByID(folder_id); } - else - { - mFolderCombo->setCurrentByID(mLandmarksID); - } } void LLFloaterCreateLandmark::onCreateFolderClicked() -- cgit v1.2.3