Skip to content
Snippets Groups Projects
Commit 5f4764c7 authored by Martin Reddy's avatar Martin Reddy
Browse files

DEV-39188: clicking on unsupported secondlife:///app/ SLURLs now

brings up a notification telling you this; rather than displaying
the Place side panel with N/A information.

Now, if you click on an Event or Classified SLURL, you get this
unsupported alert (2.0 does not have side panels for these types
of assets, instead they are integrated into Search).
parent b6c716e5
No related branches found
No related tags found
No related merge requests found
...@@ -158,7 +158,8 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url, ...@@ -158,7 +158,8 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url,
LLMediaCtrl* web, LLMediaCtrl* web,
bool trusted_browser) bool trusted_browser)
{ {
if (!LLSLURL::isSLURL(url)) // ensure the URL is in the secondlife:///app/ format
if (!LLSLURL::isSLURLCommand(url))
{ {
return false; return false;
} }
...@@ -170,7 +171,14 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url, ...@@ -170,7 +171,14 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url,
pathArray.erase(0); // erase "cmd" pathArray.erase(0); // erase "cmd"
bool handled = LLCommandDispatcher::dispatch( bool handled = LLCommandDispatcher::dispatch(
cmd, pathArray, uri.queryMap(), web, trusted_browser); cmd, pathArray, uri.queryMap(), web, trusted_browser);
return handled;
// alert if we didn't handle this secondlife:///app/ SLURL
// (but still return true because it is a valid app SLURL)
if (! handled)
{
LLNotifications::instance().add("UnsupportedCommandSLURL");
}
return true;
} }
// static // static
......
...@@ -6501,6 +6501,14 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block ...@@ -6501,6 +6501,14 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
The link you clicked cannot be opened from this web browser. The link you clicked cannot be opened from this web browser.
</notification> </notification>
<notification
icon="notifytip.tga"
name="UnsupportedCommandSLURL"
priority="high"
type="notifytip">
The SLURL you clicked on is not supported.
</notification>
<notification name="IMToast" type="notifytoast"> <notification name="IMToast" type="notifytoast">
[MESSAGE] [MESSAGE]
<form name="form"> <form name="form">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment