From 09b561dadd18488d0754652d12d615b55740d4e9 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 31 Aug 2012 21:05:31 +0200 Subject: [PATCH] fix FIRE-7468 Destinations + Choose Avatar floaters are broken --- indra/newview/fsgridhandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index 538b1e8385..dd45338def 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -1178,7 +1178,11 @@ std::string LLGridManager::getGridId(const std::string& grid) std::string grid_name = getGrid(grid); if (!grid.empty()) { - grid_id = mGridList[grid_name][GRID_ID_VALUE].asString(); + // FS:AW FIRE-7468 + // NOTE: GRID_ID_VALUE has a different meaning in llviewernetwork + // than here, which was inherited from the pathfinding changes. + // GRID_NICK_VALUE is the one we want *here*. + grid_id = mGridList[grid_name][GRID_NICK_VALUE].asString(); } else {