From 5fdcea0963064d42e97f2972ae765c5d6618a0be Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 30 Sep 2018 21:32:55 +0200 Subject: [PATCH] Exclude local grid file variable declaration if SINGLEGRID is defined --- indra/newview/fsgridhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index 15d86fb839..befe182bda 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -179,8 +179,8 @@ void LLGridManager::initGrids() { mGridList = LLSD(); - std::string grid_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "grids.xml"); #ifndef SINGLEGRID + std::string grid_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "grids.xml"); std::string grid_user_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids.user.xml"); std::string grid_remote_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids.remote.xml");