diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
| commit | 96bb17f20bbcdc595f3a615a3129e134595b3a4a (patch) | |
| tree | e51e47f79b78a076e821360763196cc72c154aad /indra/newview/llfloaterabout.cpp | |
| parent | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index f58a5881a8..01c9416973 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -214,9 +214,9 @@ void LLFloaterAbout::startFetchServerReleaseNotes() /*static*/ void LLFloaterAbout::handleServerReleaseNotes(LLSD results) { - LLFloaterAbout* floater_about = LLFloaterReg::getTypedInstance<LLFloaterAbout>("sl_about"); - if (floater_about) - { +// LLFloaterAbout* floater_about = LLFloaterReg::getTypedInstance<LLFloaterAbout>("sl_about"); +// if (floater_about) +// { LLSD http_headers; if (results.has(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS)) { @@ -234,7 +234,7 @@ void LLFloaterAbout::handleServerReleaseNotes(LLSD results) location = LLTrans::getString("ErrorFetchingServerReleaseNotesURL"); } LLAppViewer::instance()->setServerReleaseNotesURL(location); - } +// } } class LLFloaterAboutListener: public LLEventAPI @@ -300,3 +300,4 @@ void LLFloaterAboutUtil::registerFloater() &LLFloaterReg::build<LLFloaterAbout>); } + |