From 596b047ded566b067d7625419fc517f4c613dc9b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 4 Apr 2022 17:31:30 -0400
Subject: [PATCH] Fix more slurl bug
---
indra/newview/llurldispatcher.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index e9f31661c7a..099319a1167 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -153,7 +153,7 @@ bool LLURLDispatcherImpl::dispatchApp(const LLSLURL& slurl,
bool trusted_browser)
{
LL_INFOS() << "cmd: " << slurl.getAppCmd() << " path: " << slurl.getAppPath() << " query: " << slurl.getAppQuery() << LL_ENDL;
- const LLSD& query_map = LLURI::queryMap(slurl.getAppQuery());
+ const LLSD& query_map = slurl.getAppQueryMap();
bool handled = LLCommandDispatcher::dispatch(
slurl.getAppCmd(), slurl.getAppPath(), query_map, web, nav_type, trusted_browser);
@@ -214,8 +214,9 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL&
{
// we can't teleport cross grid at this point
- if( LLGridManager::getInstance()->getGrid(slurl.getGrid())
- != LLGridManager::getInstance()->getGrid())
+ if(LLGridManager::instance().isInSecondlife() &&
+ (LLGridManager::getInstance()->getGrid(slurl.getGrid())
+ != LLGridManager::getInstance()->getGrid()))
{
LLSD args;
args["SLURL"] = slurl.getLocationString();
--
GitLab