diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
| commit | 487fce4afaed69268db4fb996e420ba8984101d3 (patch) | |
| tree | 365a4d16f511c083334b5315c6ffc882c558a300 /indra/newview/llappviewer.cpp | |
| parent | e414dfad51b3747fa20c0023820980f23f1cad2c (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge with 3.7.11-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 13da1c9406..c65bddc58b 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3379,6 +3379,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 { @@ -4860,7 +4864,7 @@ void LLAppViewer::idle() static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD); // Update session stats every large chunk of time - // *FIX: (???) SAMANTHA + // *FIX: (?) SAMANTHA if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD && !gDisconnected) { LL_INFOS() << "Transmitting sessions stats" << LL_ENDL; |