summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginprocessparent.h
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-27 15:17:20 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-27 15:17:20 -0400
commitfa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch)
tree3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llplugin/llpluginprocessparent.h
parentfae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff)
parentd2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff)
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
-rw-r--r--indra/llplugin/llpluginprocessparent.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 74b7e9f50c..26c6b0c402 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -178,9 +178,7 @@ 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;