From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 6 Jul 2009 21:58:04 +0000
Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color
 changes, also UI color refactoring and new FreeType font library on Linux.
 svn merge -r126038:126164
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5

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

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

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 3a76e72868..6a6e15867b 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -428,14 +428,10 @@ void LLPanel::initFromParams(const LLPanel::Params& p)
 		mUIStrings[it->name] = it->text;
 	}
 
-	setName(p.name());
 	setLabel(p.label());
-
 	setShape(p.rect);
 	parseFollowsFlags(p);
 
-	setEnabled(p.enabled);
-	setVisible(p.visible);
 	setToolTip(p.tool_tip());
 	setSaveToXML(p.serializable);
 	
-- 
cgit v1.2.3