SL-15759 Crash in setCapability

Different subcase of same crash, this one for losing connection

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 1bc6ab076b..ba02f92791 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -314,19 +314,19 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)
         regionp = NULL;
         result = httpAdapter->postAndSuspend(httpRequest, url, capabilityNames);
 
-        ++mSeedCapAttempts;
-
         if (STATE_WORLD_INIT > LLStartUp::getStartupState())
         {
             LL_INFOS("AppInit", "Capabilities") << "Aborting capabilities request, reason: returned to login screen" << LL_ENDL;
             return;
         }
 
-        if (LLApp::isExiting())
+        if (LLApp::isExiting() || gDisconnected)
         {
             return;
         }
 
+        ++mSeedCapAttempts;
+
         regionp = LLWorld::getInstance()->getRegionFromHandle(regionHandle);
         if (!regionp) //region was removed
         {
@@ -441,7 +441,7 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCompleteCoro(U64 regionHandle)
             break;  // no retry
         }
 
-        if (LLApp::isExiting())
+        if (LLApp::isExiting() || gDisconnected)
         {
             break;
         }
@@ -549,7 +549,7 @@ void LLViewerRegionImpl::requestSimulatorFeatureCoro(std::string url, U64 region
             continue;  
         }
 
-        if (LLApp::isExiting())
+        if (LLApp::isExiting() || gDisconnected)
         {
             break;
         }