livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/lindenlab/viewer

meow-7.2.2
Ansariel 2021-07-15 13:30:18 +02:00
parent b758c75584 be6066eae2
commit 8cec3063e0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloatercreatelandmark.cpp
View File

@ -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()