From 7dada07dbaae3dfb9b1319453e51019bfff2717f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 20 Feb 2007 22:02:36 +0000
Subject: svn merge -r 57620:58007
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llimpanel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llimpanel.cpp')

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index b7a29b63b9..83c08ec602 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -592,7 +592,7 @@ void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller, void* userda
 	}
 }
 
-void LLFloaterIMPanel::close(bool app_quitting)
+void LLFloaterIMPanel::onClose(bool app_quitting)
 {
 	setTyping(FALSE);
 
-- 
cgit v1.2.3