diff options
| author | Richard Linden <none@none> | 2012-01-03 09:41:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-03 09:41:49 -0800 |
| commit | 9f929043430632ef629a97977da7430685dd30e1 (patch) | |
| tree | c6fd8c22a81a9ebe49768639ad9caa37694305d9 /indra/newview/llfloatersnapshot.cpp | |
| parent | ed431700ed7ddd57a3629a3cd6bfb9c39b6105e0 (diff) | |
| parent | 3861249a749c99c2a7b05d15ef82f8ff21453d05 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 56d53ebdf0..78931acbe1 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1983,7 +1983,7 @@ LLFloaterSnapshot::LLFloaterSnapshot(const LLSD& key) // Destroys the object LLFloaterSnapshot::~LLFloaterSnapshot() { - delete impl.mPreviewHandle.get(); + if (impl.mPreviewHandle.get()) impl.mPreviewHandle.get()->die(); //unfreeze everything else gSavedSettings.setBOOL("FreezeTime", FALSE); |