From 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Wed, 30 May 2007 17:39:09 +0000
Subject: merge -r61423:62602 svn/branches/maintenance --> release

---
 indra/llui/llview.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llui/llview.cpp')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index da5c77fc94..05c2247a35 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -176,6 +176,9 @@ LLView::~LLView()
 		(*itor).second->clearDispatchers();
 		delete (*itor).second;
 	}
+
+	std::for_each(mFloaterControls.begin(), mFloaterControls.end(),
+				  DeletePairedPointer());
 }
 
 // virtual
-- 
cgit v1.2.3