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

Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2021-07-06 10:36:52 +02:00
parent ae3fc753f9 d38866d030
commit b6830d44a5
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 : 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)
}
}
}
}
}

16
indra/newview/lllandmarklist.cpp
View File

@ -74,6 +74,16 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
{
return NULL;
}
if (cb)
{
// Multiple different sources can request same landmark,
// mLoadedCallbackMap is a multimap that allows multiple pairs with same key
// Todo: this might need to be improved to not hold identical callbacks multiple times
loaded_callback_map_t::value_type vt(asset_uuid, cb);
mLoadedCallbackMap.insert(vt);
}
if ( mWaitList.find(asset_uuid) != mWaitList.end() )
{
// Landmark is sheduled for download, but not requested yet
@ -89,12 +99,6 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
return NULL;
}
}
if (cb)
{
loaded_callback_map_t::value_type vt(asset_uuid, cb);
mLoadedCallbackMap.insert(vt);
}
if (mRequestedList.size() > MAX_SIMULTANEOUS_REQUESTS)
{

2
indra/newview/skins/default/xui/en/floater_create_landmark.xml
View File

@ -47,7 +47,7 @@
layout="topleft"
name="folder_label"
top_pad="10"
value="Landmark location:"
value="Save this landmark in:"
width="290" />
<combo_box
follows="bottom|left"