From 9d714981dd2a9f1a5045ec95032fb7a4b276fd99 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 4 Apr 2022 17:30:32 -0400
Subject: [PATCH] More slurl fixing
---
indra/newview/llviewernetwork.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 3007265d216..95a136d6682 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -1131,9 +1131,13 @@ std::string LLGridManager::getSLURLBase(const std::string& grid) const
}
else
{
- grid_base = llformat(DEFAULT_SLURL_BASE, grid.c_str());
+ grid_base = llformat(DEFAULT_SLURL_BASE, grid_name.c_str());
}
}
+ else
+ {
+ grid_base = llformat(DEFAULT_SLURL_BASE, grid.c_str());
+ }
LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
return grid_base;
}
@@ -1151,9 +1155,13 @@ std::string LLGridManager::getAppSLURLBase(const std::string& grid) const
}
else
{
- grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid.c_str());
+ grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid_name.c_str());
}
}
+ else
+ {
+ grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid.c_str());
+ }
LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
return grid_base;
}
--
GitLab