IMP-590: Added a thread-safe and robust wrapper for APR pools.

See http://redmine.imprudenceviewer.org/issues/590

1 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp
index b822b9e..3a1395c 100755
--- a/linden/indra/llplugin/llplugininstance.cpp
+++ b/linden/indra/llplugin/llplugininstance.cpp
@@ -36,8 +36,7 @@
 #include "linden_common.h"
 
 #include "llplugininstance.h"
-
-#include "llapr.h"
+#include "aiaprpool.h"
 
 /** Virtual destructor. */
 LLPluginInstanceMessageListener::~LLPluginInstanceMessageListener()
@@ -86,7 +85,7 @@ int LLPluginInstance::load(std::string &plugin_file)
         
         int result = apr_dso_load(&mDSOHandle,
                                           plugin_file.c_str(),
-                                          gAPRPoolp);
+                                          AIAPRRootPool::get()());
         if(result != APR_SUCCESS)
         {
                 char buf[1024];