Merge of final upload-queue changes from Branch_1-13-4 --> release

svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

In order, that's:
* back out upload-queue
* apply a subset
* apply the full thing
* re-merge the addition of the DELETE REST

Most of which turns into a no-op. Reviewed by don.

1 files changed, 7 insertions, 6 deletions

diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 873e8fa9db..5b758c88b4 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -415,20 +415,21 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
 				if (callback == tmp->mDownCallback && user_data == tmp->mUserData)
 				{
 					// this is a duplicate from the same subsystem - throw it away
-					llinfos << "Discarding duplicate request for UUID " << uuid << llendl;
+					llwarns << "Discarding duplicate request for asset " << uuid
+							<< "." << LLAssetType::lookup(type) << llendl;
 					return;
 				}
-				else
-				{
-					llinfos << "Adding additional non-duplicate request for UUID " << uuid << llendl;
-				}
 				
 				// this is a duplicate request
 				// queue the request, but don't actually ask for it again
 				duplicate = TRUE;
-				break;
 			}
 		}
+		if (duplicate)
+		{
+			llinfos << "Adding additional non-duplicate request for asset " << uuid 
+					<< "." << LLAssetType::lookup(type) << llendl;
+		}
 		
 		// This can be overridden by subclasses
 		_queueDataRequest(uuid, type, callback, user_data, duplicate, is_priority);