From 4ecb9cb63e4993b3b4bc65d73ed255139b5c3f75 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Tue, 1 May 2007 21:39:25 +0000
Subject: svn merge -r 59163:61099
 svn+ssh://svn/svn/linden/branches/release-candidate into release

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

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

diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
index fde27132e6..215f6d40ed 100644
--- a/indra/llui/llcheckboxctrl.cpp
+++ b/indra/llui/llcheckboxctrl.cpp
@@ -156,7 +156,7 @@ void LLCheckBoxCtrl::onCommit()
 
 void LLCheckBoxCtrl::setEnabled(BOOL b)
 {
-	LLUICtrl::setEnabled(b);
+	LLView::setEnabled(b);
 	mButton->setEnabled(b);
 }
 
-- 
cgit v1.2.3