1 files changed, 7 insertions, 13 deletions

diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index 40272ee..79982c6 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -88,18 +88,11 @@ void LLIconCtrl::draw()
 {
         if( getVisible() ) 
         {
-                // Border
-                BOOL has_image = !mImageID.isNull();
-
-                if( has_image )
+                if( mImagep.notNull() )
                 {
-                        if( mImagep.notNull() )
-                        {
-                                gl_draw_scaled_image(0, 0, 
-                                                                         mRect.getWidth(), mRect.getHeight(), 
-                                                                         mImagep,
-                                                                         mColor );
-                        }
+                        mImagep->draw(0, 0, 
+                                                        mRect.getWidth(), mRect.getHeight(), 
+                                                        mColor );
                 }
 
                 LLUICtrl::draw();
@@ -154,6 +147,7 @@ LLView* LLIconCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
         LLUICtrlFactory::getAttributeColor(node,"color", color);
 
         LLIconCtrl* icon = new LLIconCtrl(name, rect, image_id);
+
         icon->setColor(color);
 
         icon->initFromXML(node, parent);