livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from default branch 

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-08-10 16:23:15 +03:00
parent 20bdbd487e 60b12a24d4
commit 0afdb8a02f
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llmediadataclient.cpp
View File

@ -263,18 +263,15 @@ void LLMediaDataClient::pushBack(request_ptr_t request)
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);
}
}
@ -284,14 +281,11 @@ void LLMediaDataClient::stopTrackingRequest(request_ptr_t 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;
}
}