Assertion bug fix for libcwd with dc::curl on and curlio off.

indra/llmessage/aihttptimeout.cpp

@@ -84,6 +84,11 @@ public:
 
 #include "aihttptimeout.h"
 
+// If this is set, treat dc::curlio as off in the assertion below.
+#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
+bool gCurlIo;
+#endif
+
 namespace AICurlPrivate {
 namespace curlthread {
 
@@ -169,7 +174,7 @@ bool HTTPTimeout::data_received(size_t n/*,*/
 	  // using CURLOPT_DEBUGFUNCTION. Note that mDebugIsHeadOrGetMethod is only valid when the debug channel 'curlio' is on,
 	  // because it is set in the debug callback function.
 	  // This is also normal if we received a HTTP header with an error status, since that can interrupt our upload.
-	  Debug(llassert(upload_error_status || AICurlEasyRequest_wat(*mLockObj)->mDebugIsHeadOrGetMethod || !dc::curlio.is_on()));
+	  Debug(llassert(upload_error_status || AICurlEasyRequest_wat(*mLockObj)->mDebugIsHeadOrGetMethod || !dc::curlio.is_on() || gCurlIo));
 	  // 'Upload finished' detection failed, generate it now.
 	  upload_finished();
 	}

indra/llmessage/aihttptimeout.h

@@ -133,5 +133,9 @@ class HTTPTimeout : public LLRefCount {
 } // namespace curlthread
 } // namespace AICurlPrivate
 
+#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
+extern bool gCurlIo;
+#endif
+
 #endif
 

indra/newview/llstartup.cpp

@@ -260,10 +260,6 @@ extern S32 gStartImageHeight;
 // local globals
 //
 
-#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
-static bool gCurlIo;
-#endif
-
 static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;