diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 0af795d64b80eed3a7af3919da9c8a7e36e0adf9..1f1e01d05908f55ae4e1f4e24459ff87534b3e85 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))