diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
| commit | c4c8debfc230b4ec6d28c7a84cd2a9bb81d6c894 (patch) | |
| tree | d01f663d3fc1562d773a229e943addb02d14089f /indra/llplugin/llpluginprocessparent.cpp | |
| parent | 51865f4e94885471dba0402b33f0b11b72bbdb30 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pull merge from lindenlab/viewer-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); |