1 files changed, 6 insertions, 11 deletions

diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 7e8aff1..53036bc 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -103,8 +103,10 @@ std::string get_shared_secret();
 class LLMessagePollInfo
 {
 public:
+        LLMessagePollInfo(void) : mPool(LLThread::tldata().mRootPool) { }
         apr_socket_t *mAPRSocketp;
         apr_pollfd_t mPollFD;
+        AIAPRPool mPool;
 };
 
 namespace
@@ -291,20 +293,13 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port,
         }
 //      LL_DEBUGS("Messaging") <<  << "*** port: " << mPort << llendl;
 
-        //
-        // Create the data structure that we can poll on
-        //
-        if (!gAPRPoolp)
-        {
-                LL_ERRS("Messaging") << "No APR pool before message system initialization!" << llendl;
-                ll_init_apr();
-        }
+        mPollInfop = new LLMessagePollInfo;
+
         apr_socket_t *aprSocketp = NULL;
-        apr_os_sock_put(&aprSocketp, (apr_os_sock_t*)&mSocket, gAPRPoolp);
+        apr_os_sock_put(&aprSocketp, (apr_os_sock_t*)&mSocket, mPollInfop->mPool());
 
-        mPollInfop = new LLMessagePollInfo;
         mPollInfop->mAPRSocketp = aprSocketp;
-        mPollInfop->mPollFD.p = gAPRPoolp;
+        mPollInfop->mPollFD.p = mPollInfop->mPool();
         mPollInfop->mPollFD.desc_type = APR_POLL_SOCKET;
         mPollInfop->mPollFD.reqevents = APR_POLLIN;
         mPollInfop->mPollFD.rtnevents = 0;