From f6bd78083d6510e01c174e691153679a76334791 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 22 Jan 2012 02:49:06 +0100
Subject: [PATCH] More merge fixes

---
 indra/llcommon/llframetimer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
index b46cca053..4ffb22515 100644
--- a/indra/llcommon/llframetimer.cpp
+++ b/indra/llcommon/llframetimer.cpp
@@ -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;
 }