From 133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 14 Mar 2008 19:27:38 +0000
Subject: svn merge -r 82272:82277
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 -->
 release

QAR-364 - merge of maint-ui-9
---
 indra/llui/llfloater.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui')

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 32ee0227d0..6597ef46da 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -185,6 +185,8 @@ public:
 	// Defaults to destroy().
 	virtual void	onClose(bool app_quitting) { destroy(); }
 
+	// This cannot be "const" until all derived floater canClose()
+	// methods are const as well.  JC
 	virtual BOOL	canClose() { return TRUE; }
 
 	virtual void	setVisible(BOOL visible);
-- 
cgit v1.2.3