summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-03 09:41:16 -0800
committerRichard Linden <none@none>2012-01-03 09:41:16 -0800
commit3861249a749c99c2a7b05d15ef82f8ff21453d05 (patch)
treedcc087fe66d15634fde03e7a4bfaf5b8c7c0dab6 /indra/newview/llpanelteleporthistory.cpp
parent0c0ff35d19969cc762dce510a4d5ee4649d96a24 (diff)
use lazy deletion of views via die() method to avoid some potential crashes
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rw-r--r--indra/newview/llpanelteleporthistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index d3543daff0..1f1cccad85 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -388,7 +388,7 @@ LLTeleportHistoryPanel::LLTeleportHistoryPanel()
LLTeleportHistoryPanel::~LLTeleportHistoryPanel()
{
LLTeleportHistoryFlatItemStorage::instance().purge();
- delete mGearMenuHandle.get();
+ if (mGearMenuHandle.get()) mGearMenuHandle.get()->die();
mTeleportHistoryChangedConnection.disconnect();
}