diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-06-11 19:30:02 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-06-11 19:30:02 +0300 |
| commit | f851d453dcccdf029f5cda6f90c34561cc116236 (patch) | |
| tree | bd9abc5e13af0a8ea061b7b6621da8a771737850 | |
| parent | ec3c0c4ae104cf8a926af1fcb082fe52438fd505 (diff) | |
MAINT-5269 FIXED Viewer crashes if you open Help -> About Second Life while a group member list is loading.
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index b342d8fdf3..e71daa6067 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -289,15 +289,11 @@ void LLServerReleaseNotesURLFetcher::httpCompleted() LL_DEBUGS("ServerReleaseNotes") << dumpResponse() << " [headers:" << getResponseHeaders() << "]" << LL_ENDL; - LLFloaterAbout* floater_about = LLFloaterReg::getTypedInstance<LLFloaterAbout>("sl_about"); - if (floater_about) + std::string location = getResponseHeader(HTTP_IN_HEADER_LOCATION); + if (location.empty()) { - std::string location = getResponseHeader(HTTP_IN_HEADER_LOCATION); - if (location.empty()) - { - location = LLTrans::getString("ErrorFetchingServerReleaseNotesURL"); - } - LLAppViewer::instance()->setServerReleaseNotesURL(location); + location = LLTrans::getString("ErrorFetchingServerReleaseNotesURL"); } + LLAppViewer::instance()->setServerReleaseNotesURL(location); } |