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/lllayoutstack.cpp | |
parent | 304e321f89e9a517ba90d6b41999a65591639ad9 (diff) | |
parent | d4a8f4c6efd11b4cb3ccba320f18e8508668b915 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rw-r--r-- | indra/llui/lllayoutstack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 5e15fa3919..7d8c102750 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -247,7 +247,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o } p.from_xui = true; - setupParams(p, parent); + applyXUILayout(p, parent); LLLayoutStack* layout_stackp = LLUICtrlFactory::create<LLLayoutStack>(p); if (parent && layout_stackp) |