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

fix for unit test asserts

meow-7.2.2
Richard Linden 2010-08-03 12:13:50 -07:00
parent c89ff6e80b
commit 2f10bcf5f5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llmediadataclient.cpp
View File

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