summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginsharedmemory.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/llpluginsharedmemory.h
parentfae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff)
parentd2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff)
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llplugin/llpluginsharedmemory.h')
-rw-r--r--indra/llplugin/llpluginsharedmemory.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llplugin/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h
index 84b7a58c32..c6cd49cabb 100644
--- a/indra/llplugin/llpluginsharedmemory.h
+++ b/indra/llplugin/llpluginsharedmemory.h
@@ -28,8 +28,6 @@
#ifndef LL_LLPLUGINSHAREDMEMORY_H
#define LL_LLPLUGINSHAREDMEMORY_H
-#include "llaprpool.h"
-
class LLPluginSharedMemoryPlatformImpl;
/**
@@ -110,7 +108,6 @@ private:
bool close(void);
bool unlink(void);
- LLAPRPool mPool;
std::string mName;
size_t mSize;
void *mMappedAddress;