diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e3c89f1a5f..e4de00b9e5 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3364,6 +3364,10 @@ LLSD LLAppViewer::getViewerInfo() const { info["SERVER_RELEASE_NOTES_URL"] = LLTrans::getString("RetrievingData"); } + else + { + info["SERVER_RELEASE_NOTES_URL"] = LLTrans::getString("NotConnected"); + } } else if (LLStringUtil::startsWith(mServerReleaseNotesURL, "http")) // it's an URL { diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 4331a63346..27ca9ab56a 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -149,7 +149,8 @@ BOOL LLFloaterAbout::postBuild() } else // not logged in { - setSupportText(LLStringUtil::null); + LL_DEBUGS("ViewerInfo") << "cannot display region info when not connected" << LL_ENDL; + setSupportText(LLTrans::getString("NotConnected")); } support_widget->blockUndo(); @@ -268,11 +269,15 @@ void LLFloaterAbout::setSupportText(const std::string& server_release_notes_url) LLViewerTextEditor *support_widget = getChild<LLViewerTextEditor>("support_editor", true); + LLUIColor about_color = LLUIColorTable::instance().getColor("TextFgReadOnlyColor"); +# if 0 support_widget->clear(); support_widget->appendText(LLAppViewer::instance()->getViewerInfoString(), - FALSE, - LLStyle::Params() - .color(LLUIColorTable::instance().getColor("TextFgReadOnlyColor"))); + FALSE, LLStyle::Params() .color(about_color)); +# else + support_widget->setText(LLAppViewer::instance()->getViewerInfoString(), + LLStyle::Params() .color(about_color)); +# endif } ///---------------------------------------------------------------------------- @@ -306,9 +311,9 @@ void LLServerReleaseNotesURLFetcher::startFetch() // virtual void LLServerReleaseNotesURLFetcher::completedHeader(U32 status, const std::string& reason, const LLSD& content) { - lldebugs << "Status: " << status << llendl; - lldebugs << "Reason: " << reason << llendl; - lldebugs << "Headers: " << content << llendl; + LL_DEBUGS("VersionInfo") << "Status: " << status + << "Reason: " << reason + << "Headers: " << content << LL_ENDL; LLFloaterAbout* floater_about = LLFloaterReg::getTypedInstance<LLFloaterAbout>("sl_about"); if (floater_about) |