From 0c600741c3d2577408b375879a80e3fd80af8574 Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Sun, 9 Aug 2015 21:36:40 -0600
Subject: [PATCH] Check for app_slurl_base on remote add
---
indra/newview/llviewernetwork.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 0af795d64b..1f1e01d059 100755
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -71,7 +71,9 @@ const std::string GRID_GATEKEEPER = "gatekeeper";
// we need to continue to support existing forms, as slurls
// are shared between viewers that may not understand newer
// forms.
+/// slurl base for grid slurls
const std::string GRID_SLURL_BASE = "slurl_base";
+/// slurl base for grid slapp links
const std::string GRID_APP_SLURL_BASE = "app_slurl_base";
const std::string DEFAULT_LOGIN_PAGE = "http://viewer-login.agni.lindenlab.com/";
@@ -562,6 +564,11 @@ void LLGridManager::gridInfoResponderCallback(LLSD& grid, LLXMLNodePtr root_node
grid[GRID_SLURL_BASE] = node->getTextContents();
LL_DEBUGS("GridManager") << "[\"slurl_base\"]: " << grid[GRID_SLURL_BASE] << LL_ENDL;
}
+ else if (node->hasName("app_slurl_base"))
+ {
+ grid[GRID_APP_SLURL_BASE] = node->getTextContents();
+ LL_DEBUGS("GridManager") << "[\"app_slurl_base\"]: " << grid[GRID_APP_SLURL_BASE] << LL_ENDL;
+ }
}
if (addGrid(grid))
--
GitLab