From 2663b69744e3e9019c76a47f7363f55fd8b735f0 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 7 Jul 2020 20:00:30 -0400
Subject: [PATCH] Support app slurls in nav bar for ease of use
---
indra/newview/llnavigationbar.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index b68baf53a8d..d91112b0acf 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -47,6 +47,7 @@
#include "llresizebar.h"
#include "llsearchcombobox.h"
#include "llslurl.h"
+#include "llurlaction.h"
#include "llurlregistry.h"
#include "llurldispatcher.h"
#include "llviewerinventory.h"
@@ -485,6 +486,11 @@ void LLNavigationBar::onLocationSelection()
region_name = slurl.getRegion();
local_coords = slurl.getPosition();
}
+ else if (slurl.getType() == LLSLURL::APP)
+ {
+ LLUrlAction::executeSLURL(typed_location);
+ return;
+ }
else if(!slurl.isValid())
{
// we have to do this check after previous, because LLUrlRegistry contains handlers for slurl too
@@ -504,7 +510,7 @@ void LLNavigationBar::onLocationSelection()
}
else
{
- // was an app slurl, home, whatever. Bail
+ // Unknown slurl type, bail.
return;
}
--
GitLab