diff options
| author | McCabe Maxsted | 2010-11-01 20:20:52 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-01 20:20:52 -0700 |
| commit | 037d0e34027db6fb4c94c6bba7d70cd56b1b4077 (patch) | |
| tree | 0c1331847c27e25df0fe41b73c1610177375225c /linden/indra/newview/hippoGridManager.h | |
| parent | Added missing cloud settings to settings.xml (diff) | |
| download | meta-impy-037d0e34027db6fb4c94c6bba7d70cd56b1b4077.zip meta-impy-037d0e34027db6fb4c94c6bba7d70cd56b1b4077.tar.gz meta-impy-037d0e34027db6fb4c94c6bba7d70cd56b1b4077.tar.bz2 meta-impy-037d0e34027db6fb4c94c6bba7d70cd56b1b4077.tar.xz | |
Load default grid list url from new GridUpdateList setting
Diffstat (limited to 'linden/indra/newview/hippoGridManager.h')
| -rw-r--r-- | linden/indra/newview/hippoGridManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/hippoGridManager.h b/linden/indra/newview/hippoGridManager.h index bc19ff8..8429dba 100644 --- a/linden/indra/newview/hippoGridManager.h +++ b/linden/indra/newview/hippoGridManager.h | |||
| @@ -172,7 +172,7 @@ private: | |||
| 172 | void cleanup(); | 172 | void cleanup(); |
| 173 | void loadFromFile(); | 173 | void loadFromFile(); |
| 174 | void parseFile(const std::string& fileName, bool mergeIfNewer); | 174 | void parseFile(const std::string& fileName, bool mergeIfNewer); |
| 175 | void parseUrl(const char* url, bool mergeIfNewer); | 175 | void parseUrl(const std::string url, bool mergeIfNewer); |
| 176 | void parseData(LLSD &gridInfo, bool mergeIfNewer); | 176 | void parseData(LLSD &gridInfo, bool mergeIfNewer); |
| 177 | }; | 177 | }; |
| 178 | 178 | ||