diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-08 22:38:48 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-08 22:58:55 +0300 |
| commit | 0fa8fbc4a7011b868716b09c1ab616a09e28fe0f (patch) | |
| tree | cd2336b0ccce9bb034ad0c7181c64b6b94a57f49 | |
| parent | eba7d0cb5862fef31d935acbc422522467f8702d (diff) | |
SL-16156 Fix exit crash in 360 snapshot floater
| -rw-r--r-- | indra/newview/llagent.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llfloater360capture.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7f6f6e5997..3d07e1585e 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2906,9 +2906,11 @@ void LLAgent::processMaturityPreferenceFromServer(const LLSD &result, U8 perferr bool LLAgent::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure) { - std::string url; - - url = getRegion()->getCapability(capName); + if (!getRegion()) + { + return false; + } + std::string url = getRegion()->getCapability(capName); if (url.empty()) { diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp index ffbb0bbee9..7a2f4535d3 100644 --- a/indra/newview/llfloater360capture.cpp +++ b/indra/newview/llfloater360capture.cpp @@ -84,7 +84,7 @@ LLFloater360Capture::~LLFloater360Capture() // Tell the Simulator not to send us everything anymore // and revert to the regular "keyhole" frustum of interest // list updates. - if (gSavedSettings.getBOOL("360CaptureUseInterestListCap")) + if (!LLApp::isExiting() && gSavedSettings.getBOOL("360CaptureUseInterestListCap")) { const bool send_everything = false; changeInterestListMode(send_everything); |