AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs.

indra/llmessage/lliosocket.h

@@ -168,7 +168,7 @@ protected:
 	apr_socket_t* mSocket;
 
 	// Our memory pool.
-	AIAPRPool mPool;
+	LLAPRPool mPool;
 
 	// The port if we know it.
 	U16 mPort;

indra/llmessage/llmail.cpp

@@ -56,7 +56,7 @@
 #include "llstring.h"
 #include "lluuid.h"
 #include "net.h"
-#include "aiaprpool.h"
+#include "llaprpool.h"
 
 //
 // constants
@@ -64,7 +64,7 @@
 const size_t LL_MAX_KNOWN_GOOD_MAIL_SIZE = 4096;
 
 static bool gMailEnabled = true;
-static AIAPRPool gMailPool;
+static LLAPRPool gMailPool;
 static apr_sockaddr_t* gSockAddr;
 static apr_socket_t* gMailSocket;
 

indra/llmessage/llpumpio.cpp

@@ -1136,7 +1136,7 @@ LLPumpIO::LLChainInfo::LLChainInfo() :
 	mInit(false),
 	mLock(0),
 	mEOS(false),
-	mDescriptorsPool(new AIAPRPool(LLThread::tldata().mRootPool))
+	mDescriptorsPool(new LLAPRPool(LLThread::tldata().mRootPool))
 {
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
 	mTimer.setTimerExpirySec(DEFAULT_CHAIN_EXPIRY_SECS);

indra/llmessage/llpumpio.h

@@ -41,7 +41,7 @@
 #include <sys/param.h>
 #endif
 
-#include "aiaprpool.h"
+#include "llaprpool.h"
 #include "llbuffer.h"
 #include "llframetimer.h"
 #include "lliopipe.h"
@@ -363,7 +363,7 @@ protected:
 		typedef std::pair<LLIOPipe::ptr_t, apr_pollfd_t> pipe_conditional_t;
 		typedef std::vector<pipe_conditional_t> conditionals_t;
 		conditionals_t mDescriptors;
-		boost::shared_ptr<AIAPRPool> mDescriptorsPool;
+		boost::shared_ptr<LLAPRPool> mDescriptorsPool;
 	};
 
 	// All the running chains & info
@@ -383,8 +383,8 @@ protected:
 	callbacks_t mCallbacks;
 
 	// Memory pool for pollsets & mutexes.
-	AIAPRPool mPool;
-	AIAPRPool mCurrentPool;
+	LLAPRPool mPool;
+	LLAPRPool mCurrentPool;
 	S32 mCurrentPoolReallocCount;
 
 #if LL_THREADS_APR

indra/llmessage/message.cpp

@@ -110,7 +110,7 @@ public:
 	LLMessagePollInfo(void) : mPool(LLThread::tldata().mRootPool) { }
 	apr_socket_t *mAPRSocketp;
 	apr_pollfd_t mPollFD;
-	AIAPRPool mPool;
+	LLAPRPool mPool;
 };
 
 namespace