livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix FIRE-7468 Destinations + Choose Avatar floaters are broken

Armin Weatherwax 2012-08-31 21:05:31 +02:00
parent 439a0de3b1
commit 09b561dadd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/fsgridhandler.cpp
View File

@ -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
{