From e1a760deed5f73e0d531c515605dce49a509bffe Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Sun, 3 Apr 2022 20:10:15 -0400 Subject: [PATCH] Haaaack --- indra/newview/llviewernetwork.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index a8e4f5c83d6..3007265d216 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -352,11 +352,19 @@ bool LLGridManager::addGrid(LLSD& grid_data) } else { + if (grid_data.has(GRID_GATEKEEPER)) + { + mGridList[grid][GRID_GATEKEEPER] = grid_data[GRID_GATEKEEPER]; + } LL_WARNS("GridManager")<<"duplicate grid id '"<<grid_id<<"' ignored"<<LL_ENDL; } } else { + if (grid_data.has(GRID_GATEKEEPER)) + { + mGridList[grid][GRID_GATEKEEPER] = grid_data[GRID_GATEKEEPER]; + } LL_WARNS("GridManager")<<"duplicate grid name '"<<grid<<"' ignored"<<LL_ENDL; } } -- GitLab