1 files changed, 8 insertions, 3 deletions

diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp
index e8a411a..6becb8d 100755
--- a/linden/indra/llplugin/llpluginsharedmemory.cpp
+++ b/linden/indra/llplugin/llpluginsharedmemory.cpp
@@ -84,6 +84,8 @@
         #include <sys/mman.h>
         #include <errno.h>
 #elif USE_WIN32_SHARED_MEMORY
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #endif // USE_APR_SHARED_MEMORY
 
@@ -201,7 +203,8 @@ bool LLPluginSharedMemory::create(size_t size)
         mName += createName();
         mSize = size;
         
-        apr_status_t status = apr_shm_create( &(mImpl->mAprSharedMemory), mSize, mName.c_str(), gAPRPoolp );
+        mPool.create();
+        apr_status_t status = apr_shm_create( &(mImpl->mAprSharedMemory), mSize, mName.c_str(), mPool());
         
         if(ll_apr_warn_status(status))
         {
@@ -224,7 +227,7 @@ bool LLPluginSharedMemory::destroy(void)
                 }
                 mImpl->mAprSharedMemory = NULL;
         }
-        
+        mPool.destroy();
         return true;
 }
 
@@ -233,7 +236,8 @@ bool LLPluginSharedMemory::attach(const std::string &name, size_t size)
         mName = name;
         mSize = size;
         
-        apr_status_t status = apr_shm_attach( &(mImpl->mAprSharedMemory), mName.c_str(), gAPRPoolp );
+        mPool.create();
+        apr_status_t status = apr_shm_attach( &(mImpl->mAprSharedMemory), mName.c_str(), mPool() );
         
         if(ll_apr_warn_status(status))
         {
@@ -255,6 +259,7 @@ bool LLPluginSharedMemory::detach(void)
                 }
                 mImpl->mAprSharedMemory = NULL;
         }
+        mPool.destroy();
         
         return true;
 }