summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginprocessparent.h
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-09-07 18:46:51 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-09-07 18:46:51 +0300
commit955bcbb95106e9c0c5d8b75c42c32dde52cc0bb6 (patch)
tree663ad1c3e33c002ee7ea1bfa5c86d2b713839aba /indra/llplugin/llpluginprocessparent.h
parentbb085a45db845a9bfe8aae83ecc7938f618e9ddc (diff)
parent08c0de785f29801c57feebce8fae593f86113777 (diff)
Merge mesh-development with sh-2309
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
-rw-r--r--indra/llplugin/llpluginprocessparent.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 26c6b0c402..74b7e9f50c 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -178,7 +178,9 @@ private:
static bool sUseReadThread;
apr_pollfd_t mPollFD;
+ LLAPRPool mPollFDPool;
static apr_pollset_t *sPollSet;
+ static LLAPRPool sPollSetPool;
static bool sPollsetNeedsRebuild;
static LLMutex *sInstancesMutex;
static std::list<LLPluginProcessParent*> sInstances;