From 2df0a2494691ebfdd305e6a5ee280dd758a1b337 Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Tue, 7 May 2013 16:18:31 +0000
Subject: SH-4139 Convert http downloaders and responders to llcorehttp
 patterns Initial work completed on linux, moving over to windows to do debug
 and refinement.  This includes 5/6 handlers based on existing responders and
 use of llcorehttp for the mesh header fetch.

---
 indra/newview/llappcorehttp.cpp | 48 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llappcorehttp.cpp')

diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index 0d7d41304d..4386e3283b 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2012&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2012, Linden Research, Inc.
+ * Copyright (C) 2012-2013, Linden Research, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,9 @@ LLAppCoreHttp::LLAppCoreHttp()
 	  mStopHandle(LLCORE_HTTP_HANDLE_INVALID),
 	  mStopRequested(0.0),
 	  mStopped(false),
-	  mPolicyDefault(-1)
+	  mPolicyDefault(-1),
+	  mPolicyTexture(-1),
+	  mPolicyMesh(-1)
 {}
 
 
@@ -95,6 +97,9 @@ void LLAppCoreHttp::init()
 	
 	// Setup default policy and constrain if directed to
 	mPolicyDefault = LLCore::HttpRequest::DEFAULT_POLICY_ID;
+
+	// Texture policy will use default for now.
+	mPolicyTexture = mPolicyDefault;
 	static const std::string texture_concur("TextureFetchConcurrency");
 	if (gSavedSettings.controlExists(texture_concur))
 	{
@@ -103,7 +108,7 @@ void LLAppCoreHttp::init()
 		if (concur > 0)
 		{
 			LLCore::HttpStatus status;
-			status = LLCore::HttpRequest::setPolicyClassOption(mPolicyDefault,
+			status = LLCore::HttpRequest::setPolicyClassOption(mPolicyTexture,
 															   LLCore::HttpRequest::CP_CONNECTION_LIMIT,
 															   concur);
 			if (! status)
@@ -120,6 +125,43 @@ void LLAppCoreHttp::init()
 			}
 		}
 	}
+
+	// Create the mesh class
+	mPolicyMesh = LLCore::HttpRequest::createPolicyClass();
+	if (! mPolicyMesh)
+	{
+		LL_WARNS("Init") << "Failed to create HTTP policy class for Mesh.  Using default policy."
+						 << LL_ENDL;
+		mPolicyMesh = mPolicyDefault;
+	}
+	else
+	{
+		static const std::string mesh_concur("MeshMaxConcurrentRequests");
+		if (gSavedSettings.controlExists(mesh_concur))
+		{
+			U32 setting(llmin(gSavedSettings.getU32(mesh_concur), U32(32)));
+			
+			if (setting > 0)
+			{
+				LLCore::HttpStatus status;
+				status = LLCore::HttpRequest::setPolicyClassOption(mPolicyMesh,
+																   LLCore::HttpRequest::CP_CONNECTION_LIMIT,
+																   setting);
+				if (! status)
+				{
+					LL_WARNS("Init") << "Unable to set mesh fetch concurrency.  Reason:  "
+									 << status.toString()
+								 << LL_ENDL;
+				}
+				else
+				{
+					LL_INFOS("Init") << "Application settings overriding default mesh fetch concurrency.  New value:  "
+									 << setting
+									 << LL_ENDL;
+				}
+			}
+		}
+	}
 	
 	// Kick the thread
 	status = LLCore::HttpRequest::startThread();
-- 
cgit v1.2.3