diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 4011328104e4f1fc608a719a5814b61e3c837009..bb14a29ca30dcb14488aaa4cc46d3f32c1b1aaf8 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -982,7 +982,7 @@ void LLMeshRepoThread::run()
                     // failed to load before, wait a bit
                     incomplete.push_front(req);
                 }
-                else if (!fetchMeshHeader(req.mMeshParams, req.getRetries()))
+                else if (!fetchMeshHeader(req.mMeshParams, req.canRetry()))
                 {
                     if (req.canRetry())
                     {
@@ -1071,14 +1071,14 @@ void LLMeshRepoThread::run()
                     mMutex->unlock();
                     if (req.isDelayed())
                     {
-                        incomplete.insert(req.mId);
+                        incomplete.insert(req);
                     }
                     else if (!fetchMeshDecomposition(req.mId))
                     {
                         if (req.canRetry())
                         {
                             req.updateTime();
-                            incomplete.insert(req.mId);
+                            incomplete.insert(req);
                         }
                         else
                         {
@@ -1097,7 +1097,7 @@ void LLMeshRepoThread::run()
             // holding lock, final list
             if (!mPhysicsShapeRequests.empty())
             {
-                std::set<LLUUID> incomplete;
+                std::set<UUIDBasedRequest> incomplete;
                 while (!mPhysicsShapeRequests.empty() && mHttpRequestSet.size() < sRequestHighWater)
                 {
                     mMutex->lock();
@@ -1107,14 +1107,14 @@ void LLMeshRepoThread::run()
                     mMutex->unlock();
                     if (req.isDelayed())
                     {
-                        incomplete.insert(req.mId);
+                        incomplete.insert(req);
                     }
                     else if (!fetchMeshPhysicsShape(req.mId))
                     {
                         if (req.canRetry())
                         {
                             req.updateTime();
-                            incomplete.insert(req.mId);
+                            incomplete.insert(req);
                         }
                         else
                         {