Skip to content
Snippets Groups Projects
Commit efc8b268 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-15434 Change default landmark destination

parent 21f70785
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloatercreatelandmark.cpp
+ 6
− 2
View file @ efc8b268
...@@ -143,7 +143,7 @@ void LLFloaterCreateLandmark::setLandmarkInfo(const LLUUID &folder_id) ...@@ -143,7 +143,7 @@ void LLFloaterCreateLandmark::setLandmarkInfo(const LLUUID &folder_id)
mLandmarkTitleEditor->setText(name); 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) bool cmp_folders(const folder_pair_t& left, const folder_pair_t& right)
...@@ -202,6 +202,10 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) ...@@ -202,6 +202,10 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id)
{ {
mFolderCombo->setCurrentByID(folder_id); mFolderCombo->setCurrentByID(folder_id);
} }
else
{
mFolderCombo->setCurrentByID(mLandmarksID);
}
} }
void LLFloaterCreateLandmark::onCreateFolderClicked() void LLFloaterCreateLandmark::onCreateFolderClicked()
...@@ -320,4 +324,4 @@ void LLFloaterCreateLandmark::setItem(const uuid_set_t& items) ...@@ -320,4 +324,4 @@ void LLFloaterCreateLandmark::setItem(const uuid_set_t& items)
} }
} }
} }
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment