Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index 888b962..f965dad 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -327,6 +327,9 @@ public:
         LLURLRequestComplete();
         virtual ~LLURLRequestComplete();
 
+        // The first line of an http response must be the status line
+        // true if we have already parsed this line.
+        bool haveHTTPStatus() const { return mHaveHTTPStatus; }
 protected:
         /* @name LLIOPipe virtual implementations
          */
@@ -345,6 +348,8 @@ protected:
         // value to note if we actually got the response. This value
         // depends on correct useage from the LLURLRequest instance.
         EStatus mRequestStatus;
+
+        bool mHaveHTTPStatus;
 };