diff options
author | Jacek Antonelli | 2009-09-25 05:37:55 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-09-25 15:55:24 -0500 |
commit | ec4a7a1e038a10a11e07ad145fbc015fed47816b (patch) | |
tree | 56e615397866ca3aba63c98723af56985556ff42 | |
parent | Renamed default grid "local" -> "localhost". (diff) | |
download | meta-impy-ec4a7a1e038a10a11e07ad145fbc015fed47816b.zip meta-impy-ec4a7a1e038a10a11e07ad145fbc015fed47816b.tar.gz meta-impy-ec4a7a1e038a10a11e07ad145fbc015fed47816b.tar.bz2 meta-impy-ec4a7a1e038a10a11e07ad145fbc015fed47816b.tar.xz |
Made grid manager update from Imprudence site, not Meerkat.
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/hippoGridManager.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 5fe191a..0293ef3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2009-09-25 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-09-25 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * Made grid manager update from Imprudence site, not Meerkat. | ||
4 | |||
5 | modified: linden/indra/newview/hippoGridManager.cpp: | ||
6 | |||
7 | |||
3 | * Renamed default grid "local" -> "localhost". | 8 | * Renamed default grid "local" -> "localhost". |
4 | So it matches the one downloaded from the web. | 9 | So it matches the one downloaded from the web. |
5 | 10 | ||
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp index 0208844..2143a40 100644 --- a/linden/indra/newview/hippoGridManager.cpp +++ b/linden/indra/newview/hippoGridManager.cpp | |||
@@ -452,7 +452,7 @@ void HippoGridManager::loadFromFile() | |||
452 | parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty()); | 452 | parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty()); |
453 | // merge grid info from web site, if newer. Force load, if list of grids is empty. | 453 | // merge grid info from web site, if newer. Force load, if list of grids is empty. |
454 | if (gSavedSettings.getBOOL("CheckForGridUpdates")) | 454 | if (gSavedSettings.getBOOL("CheckForGridUpdates")) |
455 | parseUrl("http://meerkatviewer.org/scripts/grids.php", !mGridInfo.empty()); | 455 | parseUrl("http://imprudenceviewer.org/app/grids/", !mGridInfo.empty()); |
456 | 456 | ||
457 | setDefaultGrid(gSavedSettings.getString("DefaultGrid")); | 457 | setDefaultGrid(gSavedSettings.getString("DefaultGrid")); |
458 | setCurrentGrid(gSavedSettings.getString("DefaultGrid")); | 458 | setCurrentGrid(gSavedSettings.getString("DefaultGrid")); |