From 87d479e7231e7668a52f8f4dde1ba829e4ddfe7d Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 10 Jun 2014 10:48:22 +0200
Subject: [PATCH] Fix merge error in llplugin.

---
 indra/llplugin/llpluginprocessparent.cpp | 2 +-
 indra/llplugin/llpluginprocessparent.h   | 2 +-
 indra/llplugin/llpluginsharedmemory.h    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index aad505c0ba..198613dd05 100755
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -1004,7 +1004,7 @@ std::string LLPluginProcessParent::addSharedMemory(size_t size)
 	
 	// <FS:ND> Use smartptr
 	 LLPluginSharedMemory *region = new LLPluginSharedMemory;
-	//LLPluginSharedMemory region( new LLPluginSharedMemory );
+	//LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
 	// </FS:ND>
 
 	// This is a new region
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 7baffa5f76..4be4843f39 100755
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -162,7 +162,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/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h
index 42f041b7b6..231d83c156 100755
--- a/indra/llplugin/llpluginsharedmemory.h
+++ b/indra/llplugin/llpluginsharedmemory.h
@@ -120,7 +120,7 @@ private:
 	
 };
 
-//typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr;
+typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr;
 
 
 #endif // LL_LLPLUGINSHAREDMEMORY_H