Commits

Vadim Savchuk committed 48dce8a Merge

Merge from default branch

Comments (0)

Files changed (1)

indra/newview/llmediadataclient.cpp

 
 void LLMediaDataClient::trackRequest(request_ptr_t request)
 {
-	request_set_t::iterator iter = mUnQueuedRequests.lower_bound(request);
+	request_set_t::iterator iter = mUnQueuedRequests.find(request);
 	
-	if (iter != mUnQueuedRequests.end())
+	if(iter != mUnQueuedRequests.end())
 	{
-		if(*iter == request)
-		{
-			LL_WARNS("LLMediaDataClient") << "Tracking already tracked request: " << *request << LL_ENDL;
-		}
-		else
-		{
-			mUnQueuedRequests.insert(iter, request);
-		}
+		LL_WARNS("LLMediaDataClient") << "Tracking already tracked request: " << *request << LL_ENDL;
+	}
+	else
+	{
+		mUnQueuedRequests.insert(request);
 	}
 }
 
 	
 	if (iter != mUnQueuedRequests.end())
 	{
-		if(*iter == request)
-		{
-			mUnQueuedRequests.erase(iter);
-		}
-		else
-		{
-			LL_WARNS("LLMediaDataClient") << "Removing an untracked request: " << *request << LL_ENDL;
-		}
+		mUnQueuedRequests.erase(iter);
+	}
+	else
+	{
+		LL_WARNS("LLMediaDataClient") << "Removing an untracked request: " << *request << LL_ENDL;
 	}
 }