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 | 1256392d01031de7160589775966b758d33a06fe (patch) | |
tree | 01510de93ec020ce6662c65a5b55fd962524aa42 /indra/newview | |
parent | d092e375fdc3d69028dd1ce246acd8e9541303b9 (diff) |
MAINT-5269 FIXED Viewer crashes if you open Help -> About Second Life while a group member list is loading.
Diffstat (limited to 'indra/newview')
-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); } |