Merge pull request #5097 from secondlife/release/2026.01

2026.01

1 files changed, 33 insertions, 3 deletions

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 377710c170..98b3ca820b 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1395,6 +1395,19 @@ bool LLFavoritesBarCtrl::enableSelected(const LLSD& userdata)
     {
         return !LLAgentPicksInfo::getInstance()->isPickLimitReached();
     }
+    else if (param == "copy_slurl"
+             || param == "show_on_map")
+    {
+        LLViewerInventoryItem* item = gInventory.getItem(mSelectedItemID);
+        if (nullptr == item)
+            return false; // shouldn't happen as it is selected from existing items
+
+        const LLUUID& asset_id = item->getAssetUUID();
+
+        // Favorites are supposed to be loaded first, it should be here already
+        LLLandmark* landmark = gLandmarkList.getAsset(asset_id, NULL /*callback*/);
+        return nullptr != landmark;
+    }
 
     return false;
 }
@@ -1425,10 +1438,17 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
         LLVector3d posGlobal;
         LLLandmarkActions::getLandmarkGlobalPos(mSelectedItemID, posGlobal);
 
+        // inventory item and asset exist, otherwise
+        // enableSelected wouldn't have let it get here,
+        // only need to check location validity
         if (!posGlobal.isExactlyZero())
         {
             LLLandmarkActions::getSLURLfromPosGlobal(posGlobal, copy_slurl_to_clipboard_cb);
         }
+        else
+        {
+            LLNotificationsUtil::add("LandmarkLocationUnknown");
+        }
     }
     else if (action == "show_on_map")
     {
@@ -1437,10 +1457,20 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
         LLVector3d posGlobal;
         LLLandmarkActions::getLandmarkGlobalPos(mSelectedItemID, posGlobal);
 
-        if (!posGlobal.isExactlyZero() && worldmap_instance)
+        if (worldmap_instance)
         {
-            worldmap_instance->trackLocation(posGlobal);
-            LLFloaterReg::showInstance("world_map", "center");
+            // inventory item and asset exist, otherwise
+            // enableSelected wouldn't have let it get here,
+            // only need to check location validity
+            if (!posGlobal.isExactlyZero())
+            {
+                worldmap_instance->trackLocation(posGlobal);
+                LLFloaterReg::showInstance("world_map", "center");
+            }
+            else
+            {
+                LLNotificationsUtil::add("LandmarkLocationUnknown");
+            }
         }
     }
     else if (action == "create_pick")