diff options
author | Jacek Antonelli | 2008-08-15 23:45:53 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:53 -0500 |
commit | eea0e92faa209f23b677fdee964023d0ce6f2fed (patch) | |
tree | f8700989d9f799d4e818920ba54516e7cf975376 /linden/indra/newview/llviewernetwork.cpp | |
parent | Second Life viewer sources 1.20.7 (diff) | |
download | meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.zip meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.gz meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.bz2 meta-impy-eea0e92faa209f23b677fdee964023d0ce6f2fed.tar.xz |
Second Life viewer sources 1.20.8
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewernetwork.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 3224c00..c1de774 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp | |||
@@ -277,7 +277,22 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const | |||
277 | 277 | ||
278 | std::string LLViewerLogin::getHelperURI() const | 278 | std::string LLViewerLogin::getHelperURI() const |
279 | { | 279 | { |
280 | return gSavedSettings.getString("CmdLineHelperURI"); | 280 | std::string helper_uri = gSavedSettings.getString("CmdLineHelperURI"); |
281 | if (helper_uri.empty()) | ||
282 | { | ||
283 | // grab URI from selected grid | ||
284 | if(mGridChoice > GRID_INFO_NONE && mGridChoice < GRID_INFO_OTHER) | ||
285 | { | ||
286 | helper_uri = gGridInfo[mGridChoice].mHelperURI; | ||
287 | } | ||
288 | |||
289 | if (helper_uri.empty()) | ||
290 | { | ||
291 | // what do we do with unnamed/miscellaneous grids? | ||
292 | // for now, operations that rely on the helper URI (currency/land purchasing) will fail | ||
293 | } | ||
294 | } | ||
295 | return helper_uri; | ||
281 | } | 296 | } |
282 | 297 | ||
283 | bool LLViewerLogin::isInProductionGrid() | 298 | bool LLViewerLogin::isInProductionGrid() |