Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into curlthreading3

Browse Source 
Conflicts:
	indra/aistatemachine/aistatemachine.cpp
This commit is contained in:
Aleric Inglewood
2012-09-22 01:25:54 +02:00
parent 2d12a82a54 5bcb350d89
commit 1254a7bbe2
14 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lltexturefetch.cpp
View File

@@ -780,7 +780,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
calcWorkPriority();
mType = host.isOk() ? LLImageBase::TYPE_AVATAR_BAKE : LLImageBase::TYPE_NORMAL;
// llinfos << "Create: " << mID << " mHost:" << host << " Discard=" << discard << llendl;
llinfos << "Create: " << mID << " mHost:" << host << " Discard=" << discard << " URL:"<< mUrl << llendl;
if (!mFetcher->mDebugPause)
{
U32 work_priority = mWorkPriority | LLWorkerThread::PRIORITY_HIGH;
@@ -2107,7 +2107,7 @@ bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, con
worker->unlockWorkMutex();
}
// llinfos << "REQUESTED: " << id << " Discard: " << desired_discard << llendl;
llinfos << "REQUESTED: " << id << " Discard: " << desired_discard << llendl;
return true;
}