From 21f70785d7d8cf5e736ab03a944be575b4f68277 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 30 Jun 2021 23:14:16 +0300 Subject: [PATCH 1/3] SL-15434 The 'Add to my Landmarks' star icon is not marked in the Top menu bar --- indra/newview/lllandmarklist.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index 921b80a667..9106d4e986 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -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) { From efc8b268a2686a86c0975b4b3f67ef821a416d98 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 30 Jun 2021 23:19:47 +0300 Subject: [PATCH 2/3] SL-15434 Change default landmark destination --- indra/newview/llfloatercreatelandmark.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 +} From d38866d030868068a9e551aab5dd340538d3b3ba Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 1 Jul 2021 13:42:14 +0300 Subject: [PATCH 3/3] SL-15512 Update text in the Favorites Bar and Favorites window --- .../skins/default/xui/en/floater_create_landmark.xml | 2 +- indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 6 +++--- indra/newview/skins/default/xui/en/strings.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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 dcedaceaeb..bba30626b2 100644 --- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml +++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml @@ -49,7 +49,7 @@ layout="topleft" name="folder_label" top_pad="10" - value="Landmark location:" + value="Save this landmark in:" width="290" /> - Your saved locations will appear here. + width="290"> + Places you save to your favorites bar will appear here. Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]. Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters]. To add a place to your landmarks, click the star to the right of the location name. - To add a place to your favorites bar, click the star to the right of the location name. + To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar". You have no listings yet. No items found. Check the spelling of your search string and try again. You do not have a copy of this texture in your inventory