diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-16 16:41:52 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-16 16:41:52 -0400 |
| commit | 903729d5c97c9f93daf463e155055653b92f8fe4 (patch) | |
| tree | 178e5b9e774702c046f3e7d279ef5b9ef8fc4d1b /indra/llplugin/llpluginprocessparent.cpp | |
| parent | f3a037f8ad520b7b070fdd057ce2d0b012121efd (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge. Refresh from viewer-release after 3.7.9 release.
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
| -rwxr-xr-x | indra/llplugin/llpluginprocessparent.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index ea0d2b81f1..b5a2588e1e 100755 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -131,6 +131,8 @@ LLPluginProcessParent::~LLPluginProcessParent() { // destroy the shared memory region iter->second->destroy(); + delete iter->second; + iter->second = NULL; // and remove it from our map mSharedMemoryRegions.erase(iter); @@ -960,6 +962,8 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) { // destroy the shared memory region iter->second->destroy(); + delete iter->second; + iter->second = NULL; // and remove it from our map mSharedMemoryRegions.erase(iter); |