From 8e11f5a434fceed53df94408c7f72ec30b5ec77e Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Sun, 16 Aug 2015 14:27:26 -0600
Subject: [PATCH] Only check against grid authority
---
indra/newview/llviewerregion.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index aca70118e2..2bfbc097c5 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2144,7 +2144,7 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
&& mSimulatorFeatures["OpenSimExtras"].has("GridURL"))
{
const std::string& grid_url = mSimulatorFeatures["OpenSimExtras"]["GridURL"].asString();
- if (LLGridManager::getInstance()->getGrid(grid_url).empty())
+ if (LLGridManager::getInstance()->getGrid(LLURI(grid_url).authority()).empty())
LLGridManager::getInstance()->addRemoteGrid(grid_url, false);
}
}
--
GitLab