From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

---
 indra/llui/lluictrl.cpp | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 1ab04054ff..28cdb1ac27 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -839,10 +839,6 @@ BOOL LLUICtrl::getTentative() const
 void LLUICtrl::setColor(const LLColor4& color)							
 { }
 
-// virtual
-void LLUICtrl::setAlpha(F32 alpha)							
-{ }
-
 
 namespace LLInitParam
 {
-- 
cgit v1.2.3