pushing what I have for tonight

indra/llui/llview.h

@@ -331,7 +331,10 @@ public:
 	// delete all children. Override this function if you need to
 	// perform any extra clean up such as cached pointers to selected
 	// children, etc.
-	virtual void deleteAllChildren();
+	// <edit>
+	//virtual void deleteAllChildren();
+	virtual void deleteAllChildren(BOOL delay_delete = FALSE);
+	// </edit>
 
 	virtual void	setTentative(BOOL b);
 	virtual BOOL	getTentative() const;
@@ -653,6 +656,12 @@ private:
 
 	S32			mNextInsertionOrdinal;
 
+	// <edit>
+public:
+	BOOL mDelayedDelete;
+	// </edit>
+private:
+
 	static LLWindow* sWindow;	// All root views must know about their window.
 
 	typedef std::map<std::string, LLPointer<LLSimpleListener> > dispatch_list_t;