diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:29 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:29 -0700 |
commit | e61da057397f95e0dcf8bf964e2836d3d4a80c20 (patch) | |
tree | 14ce479af039aee249a91b1024224de8b3a09322 /indra/newview/llfloatersnapshot.cpp | |
parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
parent | fb7af4d0010f9d14cb5464bed83d9e022dbe0d1a (diff) |
merge with viewer-development
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 00dc7b1627..9d020517d8 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -2112,7 +2112,7 @@ LLFloaterSnapshot::LLFloaterSnapshot(const LLSD& key) // Destroys the object LLFloaterSnapshot::~LLFloaterSnapshot() { - LLView::deleteViewByHandle(impl.mPreviewHandle); + delete impl.mPreviewHandle.get(); //unfreeze everything else gSavedSettings.setBOOL("FreezeTime", FALSE); |