summaryrefslogtreecommitdiff
path: root/indra/llui/llurlaction.h
diff options
context:
space:
mode:
authorsimon <none@none>2014-01-07 15:18:29 -0800
committersimon <none@none>2014-01-07 15:18:29 -0800
commitf291995dac53c2aba9d79aef8b6cd91a5c836e9f (patch)
tree8dd6b3b8dcde04580163c2f96ff03ac2ec80ce44 /indra/llui/llurlaction.h
parent2a1098552e071c625a8c1614a331e9557212d380 (diff)
Revert changes made for MAINT-535 to test in a release cohort.
Diffstat (limited to 'indra/llui/llurlaction.h')
-rwxr-xr-xindra/llui/llurlaction.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index 5f3626490c..407be9a756 100755
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -66,7 +66,9 @@ public:
static void showLocationOnMap(std::string url);
/// perform the appropriate action for left-clicking on a Url
- static void clickAction(std::string url, bool trusted_content);
+ static void clickAction(std::string url);
+ // MAINT-535 reversion test
+ //static void clickAction(std::string url, bool trusted_content);
/// copy the label for a Url to the clipboard
static void copyLabelToClipboard(std::string url);
@@ -86,7 +88,9 @@ public:
/// 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 boost::function<bool(const std::string& url)> execute_url_callback_t;
+ // MAINT-535 reversion test
+ //typedef boost::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);