diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:52:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:52:40 -0500 |
| commit | 4331c112aba074562e9a8826fe6d271a94f790f0 (patch) | |
| tree | aa6e1d387821c1ea5906a7aa9b3dd474ece431b7 /indra/llplugin/llplugininstance.cpp | |
| parent | ef490e308ccce8e6df85144784a0f4580f5ac6a1 (diff) | |
Backed out changeset 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 9c9909a017..c326961db4 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" /** Virtual destructor. */ LLPluginInstanceMessageListener::~LLPluginInstanceMessageListener() @@ -47,7 +48,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) @@ -79,7 +79,7 @@ int LLPluginInstance::load(std::string &plugin_file) int result = apr_dso_load(&mDSOHandle, plugin_file.c_str(), - mDSOHandlePool()); + gAPRPoolp); if(result != APR_SUCCESS) { char buf[1024]; |