diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index a3eda29586..19b814bc35 100755
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -366,8 +366,8 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
 					// This is a new region
 
 					// <FS:ND> use smartptr
-					LLPluginSharedMemory *region = new LLPluginSharedMemory;
-					//LLPluginSharedMemory region( new LLPluginSharedMemory );
+					// LLPluginSharedMemory *region = new LLPluginSharedMemory;
+					LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
 					// </FS:ND>
 
 					if(region->attach(name, size))
diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h
index 9f1058f053..52f71e3b5b 100755
--- a/indra/llplugin/llpluginprocesschild.h
+++ b/indra/llplugin/llpluginprocesschild.h
@@ -99,7 +99,7 @@ private:
 
 	// <FS:ND> Use boost::shred_ptr so LLPluginSharedMemory gets properly destroyed
 	// typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
-	typedef std::map<std::string, LLPluginSharedMemory > sharedMemoryRegionsType;
+	typedef std::map<std::string, LLPluginSharedMemoryPtr > sharedMemoryRegionsType;
 	// </FS:ND>
 
 	sharedMemoryRegionsType mSharedMemoryRegions;
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 198613dd05..6fbe994e6a 100755
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -1003,8 +1003,8 @@ std::string LLPluginProcessParent::addSharedMemory(size_t size)
 	std::string name;
 	
 	// <FS:ND> Use smartptr
-	 LLPluginSharedMemory *region = new LLPluginSharedMemory;
-	//LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
+	// LLPluginSharedMemory *region = new LLPluginSharedMemory;
+	LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
 	// </FS:ND>
 
 	// This is a new region
diff --git a/indra/llplugin/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h
index 231d83c156..b20d755e47 100755
--- a/indra/llplugin/llpluginsharedmemory.h
+++ b/indra/llplugin/llpluginsharedmemory.h
@@ -28,6 +28,8 @@
 #ifndef LL_LLPLUGINSHAREDMEMORY_H
 #define LL_LLPLUGINSHAREDMEMORY_H
 
+#include <boost/shared_ptr.hpp>
+
 class LLPluginSharedMemoryPlatformImpl;
 
 /**