From 735da0eb1d4bd24a1915a6cb2a9c2290a8e52bbe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 19 Oct 2023 23:03:13 +0300
Subject: [PATCH] SL-20422 Unit test fix
---
indra/newview/llslurl.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index 262ea3ca1fc..e43fb993ce0 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -112,12 +112,11 @@ LLSLURL::LLSLURL(const std::string& slurl)
// and the slurl type (APP or LOCATION)
if (slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
{
- if (path_array.size() == 0)
+ if (path_array.size() == 0
+ && slurl_uri.authority().empty()
+ && slurl_uri.escapedQuery().empty())
{
- if (slurl_uri.authority().empty() && slurl_uri.escapedQuery().empty())
- {
- mType = EMPTY;
- }
+ mType = EMPTY;
// um, we need a path...
return;
}
--
GitLab