diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:49:35 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:49:35 +0200 |
| commit | 191e5f9ca033cd1520950f35309c0bc2c4499803 (patch) | |
| tree | 684ccc50f33104413f9c52fe2ee4c3302ec77bb6 /indra/llui/llpanel.cpp | |
| parent | 304e321f89e9a517ba90d6b41999a65591639ad9 (diff) | |
| parent | d4a8f4c6efd11b4cb3ccba320f18e8508668b915 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llpanel.cpp')
| -rw-r--r-- | indra/llui/llpanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 738a96f730..db32882438 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -452,7 +452,7 @@ void LLPanel::initFromParams(const LLPanel::Params& p) parseFollowsFlags(p); setToolTip(p.tool_tip()); - setSaveToXML(p.from_xui); + setFromXUI(p.from_xui); mHoverCursor = getCursorFromString(p.hover_cursor); @@ -542,7 +542,7 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu } params.from_xui = true; - setupParams(params, parent); + applyXUILayout(params, parent); { LLFastTimer timer(FTM_PANEL_CONSTRUCTION); initFromParams(params); |