Skip to content
Snippets Groups Projects
Commit 2663b697 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Support app slurls in nav bar for ease of use

parent af5f176f
No related branches found
No related tags found
No related merge requests found
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include "llresizebar.h" #include "llresizebar.h"
#include "llsearchcombobox.h" #include "llsearchcombobox.h"
#include "llslurl.h" #include "llslurl.h"
#include "llurlaction.h"
#include "llurlregistry.h" #include "llurlregistry.h"
#include "llurldispatcher.h" #include "llurldispatcher.h"
#include "llviewerinventory.h" #include "llviewerinventory.h"
...@@ -485,6 +486,11 @@ void LLNavigationBar::onLocationSelection() ...@@ -485,6 +486,11 @@ void LLNavigationBar::onLocationSelection()
region_name = slurl.getRegion(); region_name = slurl.getRegion();
local_coords = slurl.getPosition(); local_coords = slurl.getPosition();
} }
else if (slurl.getType() == LLSLURL::APP)
{
LLUrlAction::executeSLURL(typed_location);
return;
}
else if(!slurl.isValid()) else if(!slurl.isValid())
{ {
// we have to do this check after previous, because LLUrlRegistry contains handlers for slurl too // we have to do this check after previous, because LLUrlRegistry contains handlers for slurl too
...@@ -504,7 +510,7 @@ void LLNavigationBar::onLocationSelection() ...@@ -504,7 +510,7 @@ void LLNavigationBar::onLocationSelection()
} }
else else
{ {
// was an app slurl, home, whatever. Bail // Unknown slurl type, bail.
return; return;
} }
......
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