diff options
| author | Armin Weatherwax | 2011-02-09 16:16:29 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2011-03-01 14:32:54 +0100 |
| commit | d2180c8379f33351aecfce95833bcdbd176fa698 (patch) | |
| tree | 1d27bd94419a67c15fd60c00ef7463fc22d1ee63 /linden/indra | |
| parent | Revolution Smythe: load voice module depending on login response (diff) | |
| download | meta-impy-d2180c8379f33351aecfce95833bcdbd176fa698.zip meta-impy-d2180c8379f33351aecfce95833bcdbd176fa698.tar.gz meta-impy-d2180c8379f33351aecfce95833bcdbd176fa698.tar.bz2 meta-impy-d2180c8379f33351aecfce95833bcdbd176fa698.tar.xz | |
fix: imprudence logo not showing in login screen; login screens not loading anymore after navigating to a broken one.
This also shows an error page if the login screen page is broken.
Todo: replace the trademarked logo.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llpanellogin.cpp | 14 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/html/en-us/loading/loading.html | 9 |
2 files changed, 11 insertions, 12 deletions
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index e67f336..0b91091 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp | |||
| @@ -297,7 +297,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, | |||
| 297 | 297 | ||
| 298 | // don't make it a tab stop until SL-27594 is fixed | 298 | // don't make it a tab stop until SL-27594 is fixed |
| 299 | web_browser->setTabStop(FALSE); | 299 | web_browser->setTabStop(FALSE); |
| 300 | // web_browser->navigateToLocalPage( "loading", "loading.html" ); | 300 | web_browser->navigateToLocalPage( "loading", "loading.html" ); |
| 301 | 301 | ||
| 302 | // make links open in external browser | 302 | // make links open in external browser |
| 303 | web_browser->setOpenInExternalBrowser( true ); | 303 | web_browser->setOpenInExternalBrowser( true ); |
| @@ -338,16 +338,6 @@ void LLPanelLogin::setSiteIsAlive( bool alive ) | |||
| 338 | else | 338 | else |
| 339 | // the site is not available (missing page, server down, other badness) | 339 | // the site is not available (missing page, server down, other badness) |
| 340 | { | 340 | { |
| 341 | #if !USE_VIEWER_AUTH | ||
| 342 | if ( web_browser ) | ||
| 343 | { | ||
| 344 | // hide browser control (revealing default one) | ||
| 345 | web_browser->setVisible( FALSE ); | ||
| 346 | |||
| 347 | // mark as unavailable | ||
| 348 | mHtmlAvailable = FALSE; | ||
| 349 | } | ||
| 350 | #else | ||
| 351 | 341 | ||
| 352 | if ( web_browser ) | 342 | if ( web_browser ) |
| 353 | { | 343 | { |
| @@ -356,7 +346,7 @@ void LLPanelLogin::setSiteIsAlive( bool alive ) | |||
| 356 | // mark as available | 346 | // mark as available |
| 357 | mHtmlAvailable = TRUE; | 347 | mHtmlAvailable = TRUE; |
| 358 | } | 348 | } |
| 359 | #endif | 349 | |
| 360 | } | 350 | } |
| 361 | } | 351 | } |
| 362 | 352 | ||
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html new file mode 100644 index 0000000..97174b0 --- /dev/null +++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | <body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> | ||
| 2 | <table width="100%" height="100%" border="0"> | ||
| 3 | <tr> | ||
| 4 | <td align="center" valign="middle" style="font-size:0.8em;"> | ||
| 5 | <img src="imprudence_loading.png" align="absmiddle"><br/> loading... | ||
| 6 | </td> | ||
| 7 | </tr> | ||
| 8 | </table> | ||
| 9 | </body> | ||