Merge branch 'develop' into callum/viewer-cef-2025-08

1 files changed, 20 insertions, 0 deletions

diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
index ce599a7552..8b320b59cc 100644
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -117,6 +117,16 @@ void LLUrlAction::teleportToLocation(std::string url)
     }
 }
 
+void LLUrlAction::zoomInObject(std::string url)
+{
+    LLUrlMatch match;
+    std::string object_id = getObjectId(url);
+    if (LLUUID::validate(object_id) && LLUrlRegistry::instance().findUrl(url, match))
+    {
+        executeSLURL("secondlife:///app/object/" + object_id + "/zoomin/" + match.getLocation());
+    }
+}
+
 void LLUrlAction::showLocationOnMap(std::string url)
 {
     LLUrlMatch match;
@@ -160,6 +170,16 @@ void LLUrlAction::copyLabelToClipboard(std::string url)
     }
 }
 
+std::string LLUrlAction::getURLLabel(std::string url)
+{
+    LLUrlMatch match;
+    if (LLUrlRegistry::instance().findUrl(url, match))
+    {
+       return match.getLabel();
+    }
+    return "";
+}
+
 void LLUrlAction::showProfile(std::string url)
 {
     // Get id from 'secondlife:///app/{cmd}/{id}/{action}'