diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
| commit | bf96c7f67e623b09f83b2300e7b82cb04dce1ee3 (patch) | |
| tree | 3d3ff515c4055877d2f1158287ddaf9dd5107a13 /indra/llplugin/llplugininstance.cpp | |
| parent | 76a54429fef78bb36ef5d4189e78867a7002f058 (diff) | |
| parent | 4924f0c99b021869967f4587df703084d2bdc8ed (diff) | |
merge
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]; |