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

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
Aleric Inglewood
2011-05-05 15:54:21 +02:00
parent 92696623e0 eedc1f79ec
commit 0fa396938b
23 changed files with 132 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/llpumpio.cpp
View File

@@ -451,7 +451,7 @@ void LLPumpIO::pump()
void LLPumpIO::pump(const S32& poll_timeout)
{
LLMemType m1(LLMemType::MTYPE_IO_PUMP);
LLFastTimer t1(LLFastTimer::FTM_PUMP);
LLFastTimer t1(LLFastTimer::FTM_PUMPIO);
//llinfos << "LLPumpIO::pump()" << llendl;
// Run any pending runners.