1 files changed, 12 insertions, 8 deletions

diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index d150e10..22d426a 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -194,8 +194,10 @@ LLView::~LLView()
         for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
         {
                 (*itor).second->clearDispatchers();
-                delete (*itor).second;
         }
+
+        std::for_each(mFloaterControls.begin(), mFloaterControls.end(),
+                                  DeletePairedPointer());
 }
 
 // virtual
@@ -367,22 +369,25 @@ void LLView::addChildAtEnd(LLView* child, S32 tab_group)
 }
 
 // remove the specified child from the view, and set it's parent to NULL.
-void LLView::removeChild( LLView* child )
+void LLView::removeChild(LLView* child, BOOL deleteIt)
 {
         if (child->mParentView == this) 
         {
                 mChildList.remove( child );
                 child->mParentView = NULL;
+                if (child->isCtrl())
+                {
+                        removeCtrl((LLUICtrl*)child);
+                }
+                if (deleteIt)
+                {
+                        delete child;
+                }
         }
         else
         {
                 llerrs << "LLView::removeChild called with non-child" << llendl;
         }
-
-        if (child->isCtrl())
-        {
-                removeCtrl((LLUICtrl*)child);
-        }
 }
 
 void LLView::addCtrlAtEnd(LLUICtrl* ctrl, S32 tab_group)
@@ -2507,7 +2512,6 @@ void LLView::deregisterEventListener(LLString name)
         dispatch_list_t::iterator itor = mDispatchList.find(name);
         if (itor != mDispatchList.end())
         {
-                delete itor->second;
                 mDispatchList.erase(itor);
         }
 }