From ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 30 Apr 2009 13:04:20 -0500
Subject: Second Life viewer sources 1.23.0-RC

---
 linden/indra/llmessage/llassetstorage.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llmessage/llassetstorage.cpp')

diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index a89a786..2966b60 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -539,8 +540,19 @@ void LLAssetStorage::downloadCompleteCallback(
 		return;
 	}
 
-	req->setUUID(file_id);
-	req->setType(file_type);
+	// Inefficient since we're doing a find through a list that may have thousands of elements.
+	// This is due for refactoring; we will probably change mPendingDownloads into a set.
+	request_list_t::iterator download_iter = std::find(gAssetStorage->mPendingDownloads.begin(), 
+													   gAssetStorage->mPendingDownloads.end(),
+													   req);
+	// If the LLAssetRequest doesn't exist in the downloads queue, then it either has already been deleted
+	// by _cleanupRequests, or it's a transfer.
+	if (download_iter != gAssetStorage->mPendingDownloads.end())
+	{
+		req->setUUID(file_id);
+		req->setType(file_type);
+	}
+
 	if (LL_ERR_NOERR == result)
 	{
 		// we might have gotten a zero-size file
@@ -563,7 +575,7 @@ void LLAssetStorage::downloadCompleteCallback(
 	{
 		request_list_t::iterator curiter = iter++;
 		LLAssetRequest* tmp = *curiter;
-		if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
+		if ((tmp->getUUID() == file_id) && (tmp->getType()== file_type))
 		{
 			requests.push_front(tmp);
 			iter = gAssetStorage->mPendingDownloads.erase(curiter);
@@ -1198,6 +1210,9 @@ const char* LLAssetStorage::getErrorString(S32 status)
 	case LL_ERR_CIRCUIT_GONE:
 		return "Circuit gone";
 
+	case LL_ERR_PRICE_MISMATCH:
+		return "Viewer and server do not agree on price";
+
 	default:
 		return "Unknown status";
 	}
-- 
cgit v1.1