livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error in llplugin.

Nicky 2014-06-10 10:48:22 +02:00
parent 55567f9de2
commit 87d479e723
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llplugin/llpluginprocessparent.cpp
View File

@ -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

2
indra/llplugin/llpluginprocessparent.h
View File

@ -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;

2
indra/llplugin/llpluginsharedmemory.h
View File

@ -120,7 +120,7 @@ private:
};
//typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr;
typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr;
#endif // LL_LLPLUGINSHAREDMEMORY_H