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

1 files changed, 0 insertions, 4 deletions

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);