From 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Wed, 19 Dec 2007 00:56:59 +0000
Subject: svn merge -r 75354:76103
 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 ->
 release.  Finished product of QAR-134

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

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

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index c3d949d3df..2463e62d7f 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -350,7 +350,7 @@ void LLPanelObject::getState( )
 		//forfeit focus
 		if (gFocusMgr.childHasKeyboardFocus(this))
 		{
-			gFocusMgr.setKeyboardFocus(NULL, NULL);
+			gFocusMgr.setKeyboardFocus(NULL);
 		}
 
 		// Disable all text input fields
-- 
cgit v1.3