Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake

Conflicts:
	indra/newview/llappviewer.cpp

indra/llmessage/aicurlprivate.h

@@ -40,7 +40,7 @@
 
 class AIHTTPHeaders;
 class AICurlEasyRequestStateMachine;
-class AITransferInfo;
+struct AITransferInfo;
 
 namespace AICurlPrivate {
 
@@ -406,8 +406,8 @@ class BufferedCurlEasyRequest : public CurlEasyRequest {
 	//U32 mBodyLimit;									// From the old LLURLRequestDetail::mBodyLimit, but never used.
 	U32 mStatus;										// HTTP status, decoded from the first header line.
 	std::string mReason;								// The "reason" from the same header line.
-	S32 mRequestTransferedBytes;
-	S32 mResponseTransferedBytes;
+	U32 mRequestTransferedBytes;
+	U32 mResponseTransferedBytes;
 	AIBufferedCurlEasyRequestEvents* mBufferEventsTarget;
 
   public:

indra/llmessage/aihttptimeoutpolicy.h

@@ -89,6 +89,9 @@ class AIHTTPTimeoutPolicy {
 		U16 curl_transaction,
 		U16 total_delay);
 
+	// Destructor.
+	virtual ~AIHTTPTimeoutPolicy() { }
+
 	void sanity_checks(void) const;
 
 	// Accessors.