diff options
author | McCabe Maxsted | 2010-06-21 18:08:52 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-06-26 18:55:34 -0500 |
commit | 76c05e6c883d12ceb3a1705ee745f7a3aae91e0b (patch) | |
tree | ce97c1d1c774d9e088d79601c94f076d239d73c3 | |
parent | Fixed #357: Crash in LLPanelPlace::onClickTeleport (diff) | |
download | meta-impy-76c05e6c883d12ceb3a1705ee745f7a3aae91e0b.zip meta-impy-76c05e6c883d12ceb3a1705ee745f7a3aae91e0b.tar.gz meta-impy-76c05e6c883d12ceb3a1705ee745f7a3aae91e0b.tar.bz2 meta-impy-76c05e6c883d12ceb3a1705ee745f7a3aae91e0b.tar.xz |
The 'unable to connect' popup now says the grid name, not 'Imprudence'.
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 4466fa1..63e0b4d 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -1394,7 +1394,7 @@ bool idle_startup() | |||
1394 | default: | 1394 | default: |
1395 | if (sAuthUriNum >= (int) sAuthUris.size() - 1) | 1395 | if (sAuthUriNum >= (int) sAuthUris.size() - 1) |
1396 | { | 1396 | { |
1397 | emsg << "Unable to connect to " << LLAppViewer::instance()->getSecondLifeTitle() << ".\n"; | 1397 | emsg << "Unable to connect to " << gHippoGridManager->getCurrentGrid()->getGridNick() << ".\n"; |
1398 | emsg << LLUserAuth::getInstance()->errorMessage(); | 1398 | emsg << LLUserAuth::getInstance()->errorMessage(); |
1399 | } else { | 1399 | } else { |
1400 | sAuthUriNum++; | 1400 | sAuthUriNum++; |