From 2336b76f0da1a745924d4b9f4a08ff75523e8b0d Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Tue, 26 Aug 2008 17:15:20 +0000
Subject: merge -r94900 linden/branches/kelly/qar-825 to linden/release QAR-825
 DEV-18489 Event poll is brittle and doesn't parse status correctly

---
 indra/llmessage/llhttpclient.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llmessage/llhttpclient.cpp')

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 7a6add6282..2f822aee87 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -56,7 +56,7 @@ namespace
 	{
 	public:
 		LLHTTPClientURLAdaptor(LLCurl::ResponderPtr responder)
-			: mResponder(responder), mStatus(499),
+			: LLURLRequestComplete(), mResponder(responder), mStatus(499),
 			  mReason("LLURLRequest complete w/no status")
 		{
 		}
@@ -67,6 +67,8 @@ namespace
 
 		virtual void httpStatus(U32 status, const std::string& reason)
 		{
+			LLURLRequestComplete::httpStatus(status,reason);
+
 			mStatus = status;
 			mReason = reason;
 		}
-- 
cgit v1.2.3