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

More merge fixes

Browse Source
This commit is contained in:
Aleric Inglewood
2012-01-22 02:49:06 +01:00
parent f176aeed8d
commit f6bd78083d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llframetimer.cpp
View File

@@ -36,7 +36,7 @@
#include "llframetimer.h"
#include "aiframetimer.h"
#include "aiaprpool.h"
#include "llaprpool.h"
// Local constants.
static F64 const USEC_PER_SECOND = 1000000.0;
@@ -59,7 +59,7 @@ apr_thread_mutex_t* LLFrameTimer::sGlobalMutex;
// static
void LLFrameTimer::global_initialization(void)
{
apr_thread_mutex_create(&sGlobalMutex, APR_THREAD_MUTEX_UNNESTED, AIAPRRootPool::get()());
apr_thread_mutex_create(&sGlobalMutex, APR_THREAD_MUTEX_UNNESTED, LLAPRRootPool::get()());
AIFrameTimer::sNextExpiration = NEVER;
}