diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-22 14:06:48 -0600 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-22 14:06:48 -0600 |
| commit | 616ca198143e7cc3f925add2c3b83aaf5d2fe244 (patch) | |
| tree | a6f234275727009d196dbd6070753bcb02699bb0 /indra/llui/lllayoutstack.cpp | |
| parent | 8f8e5c850a0574f30f9be1e3164531751139d2c5 (diff) | |
| parent | e72a3c63ec44255172e253fe43e192918ec6117e (diff) | |
Merge
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) |