summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-09-29 18:03:39 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-09-29 18:03:39 +0300
commit6a463a41fec89c7f1eadb77c16eeae169ff777d0 (patch)
treef297c32418eb139eded752ce99b418773328e458 /indra/newview/llpanelteleporthistory.cpp
parentc44db34a15abd2e96b8fd461e9fb3e217fe648cc (diff)
parent71ed326f51770b215ba5dd2ac8d159c3b764c2d2 (diff)
Merge sergeylproductengine/viewer-experience-fui with richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rw-r--r--indra/newview/llpanelteleporthistory.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index a253c3845c..52dd70f005 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -389,12 +389,7 @@ LLTeleportHistoryPanel::LLTeleportHistoryPanel()
LLTeleportHistoryPanel::~LLTeleportHistoryPanel()
{
LLTeleportHistoryFlatItemStorage::instance().purge();
- LLView::deleteViewByHandle(mGearMenuHandle);
-
- if (mTeleportHistoryChangedConnection.connected())
- {
- mTeleportHistoryChangedConnection.disconnect();
- }
+ delete mGearMenuHandle.get();
}
BOOL LLTeleportHistoryPanel::postBuild()