diff options
| author | McCabe Maxsted | 2011-03-24 18:39:24 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-24 18:39:24 -0700 |
| commit | 8de4f8d2cf0f6d568d5be5f5325d4729d509ee11 (patch) | |
| tree | b36b8bd6cf534a43b2ee69419e3e8b87c49d2bb0 /linden/indra/newview | |
| parent | Added a new default font size FontSansSerifBigger and fixed FontSansSerifBig ... (diff) | |
| parent | Don't try to fetch grid list from empty url in GridUpdateList (diff) | |
| download | meta-impy-8de4f8d2cf0f6d568d5be5f5325d4729d509ee11.zip meta-impy-8de4f8d2cf0f6d568d5be5f5325d4729d509ee11.tar.gz meta-impy-8de4f8d2cf0f6d568d5be5f5325d4729d509ee11.tar.bz2 meta-impy-8de4f8d2cf0f6d568d5be5f5325d4729d509ee11.tar.xz | |
Merge remote-tracking branch 'armin/exp' into exp
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/hippogridmanager.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp index a15f676..6bf6e63 100644 --- a/linden/indra/newview/hippogridmanager.cpp +++ b/linden/indra/newview/hippogridmanager.cpp | |||
| @@ -806,7 +806,17 @@ void HippoGridManager::loadFromFile() | |||
| 806 | parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty()); | 806 | parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty()); |
| 807 | // merge grid info from web site, if newer. Force load, if list of grids is empty. | 807 | // merge grid info from web site, if newer. Force load, if list of grids is empty. |
| 808 | if (gSavedSettings.getBOOL("CheckForGridUpdates")) | 808 | if (gSavedSettings.getBOOL("CheckForGridUpdates")) |
| 809 | parseUrl(gSavedSettings.getString("GridUpdateList"), !mGridInfo.empty()); | 809 | { |
| 810 | std::string update_list = gSavedSettings.getString("GridUpdateList"); | ||
| 811 | if (!update_list.empty()) | ||
| 812 | { | ||
| 813 | parseUrl(update_list, !mGridInfo.empty()); | ||
| 814 | } | ||
| 815 | else | ||
| 816 | { | ||
| 817 | llwarns << "\"CheckForGridUpdates\" is set to true, but \"GridUpdateList\" contains no URL to fetch the grid info from. Skipping." << llendl; | ||
| 818 | } | ||
| 819 | } | ||
| 810 | 820 | ||
| 811 | std::string last_grid = gSavedSettings.getString("LastSelectedGrid"); | 821 | std::string last_grid = gSavedSettings.getString("LastSelectedGrid"); |
| 812 | if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid"); | 822 | if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid"); |