summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llslurl.cpp9
-rw-r--r--indra/newview/llviewerhelp.cpp2
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index a8e012bfa1..a3a8247268 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -172,11 +172,18 @@ LLSLURL::LLSLURL(const std::string& slurl)
}
else
{
- // it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
+ if(slurl_uri.hostName() == LLSLURL::SLURL_APP_PATH)
+ {
+ mType = APP;
+ }
+ else
+ {
+ // it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
// therefore the hostname will be the region name, and it's a location type
mType = LOCATION;
// 'normalize' it so the region name is in fact the head of the path_array
path_array.insert(0, slurl_uri.hostName());
+ }
}
}
else if((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME) ||
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp
index 04c2e27c9d..3273090da5 100644
--- a/indra/newview/llviewerhelp.cpp
+++ b/indra/newview/llviewerhelp.cpp
@@ -43,7 +43,7 @@ class LLHelpHandler : public LLCommandHandler
{
public:
// requests will be throttled from a non-trusted browser
- LLHelpHandler() : LLCommandHandler("help", UNTRUSTED_THROTTLE) {}
+ LLHelpHandler() : LLCommandHandler("help", UNTRUSTED_CLICK_ONLY) {}
bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
{