summaryrefslogtreecommitdiff
path: root/indra/llui/llurlaction.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llurlaction.h')
-rw-r--r--indra/llui/llurlaction.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index ac9741a7ad..c4cfd0f3fb 100644
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -28,8 +28,8 @@
#ifndef LL_LLURLACTION_H
#define LL_LLURLACTION_H
+#include <functional>
#include <string>
-#include <boost/function.hpp>
///
/// The LLUrlAction class provides a number of static functions that
@@ -60,9 +60,15 @@ public:
/// if the Url specifies an SL location, teleport there
static void teleportToLocation(std::string url);
+ /// If the Url specifies an object id, attempt to zoom in.
+ /// If not possible to zoom in, show on map
+ static void zoomInObject(std::string url);
+
/// if the Url specifies an SL location, show it on a map
static void showLocationOnMap(std::string url);
+ static void showParcelOnMap(std::string url);
+
/// perform the appropriate action for left-clicking on a Url
static void clickAction(std::string url, bool trusted_content);
@@ -72,6 +78,8 @@ public:
/// copy a Url to the clipboard
static void copyURLToClipboard(std::string url);
+ static std::string getURLLabel(std::string url);
+
/// if the Url specifies an SL command in the form like 'app/{cmd}/{id}/*', show its profile
static void showProfile(std::string url);
static std::string getUserID(std::string url);
@@ -85,8 +93,8 @@ public:
static void unblockObject(std::string url);
/// specify the callbacks to enable this class's functionality
- typedef boost::function<void (const std::string&)> url_callback_t;
- typedef boost::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
+ typedef std::function<void (const std::string&)> url_callback_t;
+ typedef std::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
static void setOpenURLCallback(url_callback_t cb);
static void setOpenURLInternalCallback(url_callback_t cb);