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

SL-15434 The 'Add to my Landmarks' star icon is not marked in the Top menu bar

parent a4c6c705
No related branches found
No related tags found
No related merge requests found
...@@ -74,6 +74,16 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t ...@@ -74,6 +74,16 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
{ {
return NULL; 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() ) if ( mWaitList.find(asset_uuid) != mWaitList.end() )
{ {
// Landmark is sheduled for download, but not requested yet // Landmark is sheduled for download, but not requested yet
...@@ -89,12 +99,6 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t ...@@ -89,12 +99,6 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
return NULL; return NULL;
} }
} }
if (cb)
{
loaded_callback_map_t::value_type vt(asset_uuid, cb);
mLoadedCallbackMap.insert(vt);
}
if (mRequestedList.size() > MAX_SIMULTANEOUS_REQUESTS) if (mRequestedList.size() > MAX_SIMULTANEOUS_REQUESTS)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment