1 files changed, 9 insertions, 8 deletions

diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index d52ff6c..8850e29 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -56,6 +56,7 @@
 #include "llstring.h"
 #include "lluuid.h"
 #include "net.h"
+#include "aiaprpool.h"
 
 //
 // constants
@@ -63,7 +64,7 @@
 const size_t LL_MAX_KNOWN_GOOD_MAIL_SIZE = 4096;
 
 static bool gMailEnabled = true;
-static apr_pool_t* gMailPool;
+static AIAPRPool gMailPool;
 static apr_sockaddr_t* gSockAddr;
 static apr_socket_t* gMailSocket;
 
@@ -88,7 +89,7 @@ bool connect_smtp()
                 gSockAddr->sa.sin.sin_family,
                 SOCK_STREAM,
                 APR_PROTO_TCP,
-                gMailPool);
+                gMailPool());
         if(ll_apr_warn_status(status)) return false;
         status = apr_socket_connect(gMailSocket, gSockAddr);
         if(ll_apr_warn_status(status))
@@ -145,19 +146,19 @@ BOOL LLMail::send(
 }
 
 // static
-void LLMail::init(const std::string& hostname, apr_pool_t* pool)
+void LLMail::init(const std::string& hostname)
 {
         gMailSocket = NULL;
-        if(hostname.empty() || !pool)
+        if (hostname.empty())
         {
-                gMailPool = NULL;
                 gSockAddr = NULL;
+                gMailPool.destroy();
         }
         else
         {
-                gMailPool = pool;
+                gMailPool.create();
 
-                // collect all the information into a socaddr sturcture. the
+                // Collect all the information into a sockaddr structure. the
                 // documentation is a bit unclear, but I either have to
                 // specify APR_UNSPEC or not specify any flags. I am not sure
                 // which option is better.
@@ -167,7 +168,7 @@ void LLMail::init(const std::string& hostname, apr_pool_t* pool)
                         APR_UNSPEC,
                         25,
                         APR_IPV4_ADDR_OK,
-                        gMailPool);
+                        gMailPool());
                 ll_apr_warn_status(status);
         }
 }