diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:58:35 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:58:35 -0500 |
| commit | c0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (patch) | |
| tree | 28ea7a212319b0bd452c68e54f374904bfe6ed8a /indra/llplugin/llplugininstance.cpp | |
| parent | fc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (diff) | |
| parent | 4331c112aba074562e9a8826fe6d271a94f790f0 (diff) | |
Merge backout of b782a75c99e6
Diffstat (limited to 'indra/llplugin/llplugininstance.cpp')
| -rw-r--r-- | indra/llplugin/llplugininstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp index e8efb233ff..7cde82a20e 100644 --- a/indra/llplugin/llplugininstance.cpp +++ b/indra/llplugin/llplugininstance.cpp @@ -29,7 +29,8 @@ #include "linden_common.h" #include "llplugininstance.h" -#include "llthread.h" // Needed for LLThread::tldata().mRootPool + +#include "llapr.h" #if LL_WINDOWS #include "direct.h" // needed for _chdir() @@ -51,7 +52,6 @@ const char *LLPluginInstance::PLUGIN_INIT_FUNCTION_NAME = "LLPluginInitEntryPoin * @param[in] owner Plugin instance. TODO:DOC is this a good description of what "owner" is? */ LLPluginInstance::LLPluginInstance(LLPluginInstanceMessageListener *owner) : - mDSOHandlePool(LLThread::tldata().mRootPool), mDSOHandle(NULL), mPluginUserData(NULL), mPluginSendMessageFunction(NULL) @@ -97,7 +97,7 @@ int LLPluginInstance::load(const std::string& plugin_dir, std::string &plugin_fi int result = apr_dso_load(&mDSOHandle, plugin_file.c_str(), - mDSOHandlePool()); + gAPRPoolp); if(result != APR_SUCCESS) { char buf[1024]; |