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

MAINT-5351: Finish messy merge restoring 'selfless' changes.

master
Nat Goodspeed 2015-07-11 08:06:15 -04:00
parent d215de3b7d
commit f1be78f7e2
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llmessage/llcorehttputil.cpp
View File

@ -596,7 +596,7 @@ LLSD HttpCoroutineAdapter::postAndYield_(LLCore::HttpRequest::ptr_t &request,
}
saveState(hhandle, request, handler);
LLSD results = waitForEventOn(handler->getReplyPump());
LLSD results = llcoro::waitForEventOn(handler->getReplyPump());
cleanState();
return results;
@ -697,7 +697,7 @@ LLSD HttpCoroutineAdapter::postAndYield_(LLCore::HttpRequest::ptr_t &request,
}
saveState(hhandle, request, handler);
LLSD results = waitForEventOn(handler->getReplyPump());
LLSD results = llcoro::waitForEventOn(handler->getReplyPump());
cleanState();
//LL_INFOS() << "Results for transaction " << transactionId << LL_ENDL;
@ -735,7 +735,7 @@ LLSD HttpCoroutineAdapter::putAndYield_(LLCore::HttpRequest::ptr_t &request,
}
saveState(hhandle, request, handler);
LLSD results = waitForEventOn(handler->getReplyPump());
LLSD results = llcoro::waitForEventOn(handler->getReplyPump());
cleanState();
//LL_INFOS() << "Results for transaction " << transactionId << LL_ENDL;
return results;
@ -790,7 +790,7 @@ LLSD HttpCoroutineAdapter::getAndYield_(LLCore::HttpRequest::ptr_t &request,
}
saveState(hhandle, request, handler);
LLSD results = waitForEventOn(handler->getReplyPump());
LLSD results = llcoro::waitForEventOn(handler->getReplyPump());
cleanState();
//LL_INFOS() << "Results for transaction " << transactionId << LL_ENDL;
return results;
@ -825,7 +825,7 @@ LLSD HttpCoroutineAdapter::deleteAndYield_(LLCore::HttpRequest::ptr_t &request,
}
saveState(hhandle, request, handler);
LLSD results = waitForEventOn(handler->getReplyPump());
LLSD results = llcoro::waitForEventOn(handler->getReplyPump());
cleanState();
//LL_INFOS() << "Results for transaction " << transactionId << LL_ENDL;
return results;

2
indra/newview/llcoproceduremanager.cpp
View File

@ -138,7 +138,7 @@ void LLCoprocedureManager::coprocedureInvokerCoro(LLCoreHttpUtil::HttpCoroutineA
while (!mShutdown)
{
waitForEventOn(mWakeupTrigger);
llcoro::waitForEventOn(mWakeupTrigger);
if (mShutdown)
break;

2
indra/newview/lleventpoll.cpp
View File

@ -197,7 +197,7 @@ namespace Details
" seconds, error count is now " << errorCount << LL_ENDL;
timeout.eventAfter(waitToRetry, LLSD());
waitForEventOn(timeout);
llcoro::waitForEventOn(timeout);
if (mDone)
break;

2
indra/newview/llpreviewnotecard.cpp
View File

@ -491,7 +491,7 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem)
mAssetStatus = PREVIEW_ASSET_LOADING;
setEnabled(false);
LLCoprocedureManager::CoProcedure_t proc = boost::bind(&LLViewerAssetUpload::AssetInventoryUploadCoproc, _1, _2, _3, url, uploadInfo);
LLCoprocedureManager::CoProcedure_t proc = boost::bind(&LLViewerAssetUpload::AssetInventoryUploadCoproc, _1, _2, url, uploadInfo);
LLCoprocedureManager::getInstance()->enqueueCoprocedure("LLViewerAssetUpload::AssetInventoryUploadCoproc", proc);
}

3
indra/newview/llviewerassetupload.h
View File

@ -193,8 +193,7 @@ class LLViewerAssetUpload
{
public:
static void AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id,
const LLUUID &id, std::string url, NewResourceUploadInfo::ptr_t uploadInfo);
static void AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, const LLUUID &id, std::string url, NewResourceUploadInfo::ptr_t uploadInfo);
private:
static void HandleUploadError(LLCore::HttpStatus status, LLSD &result, NewResourceUploadInfo::ptr_t &uploadInfo);