diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-21 11:54:27 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-21 11:54:27 -0800 |
| commit | 7012b7e5a7b6fc4a1ff2e04713105eb56b4dc9ca (patch) | |
| tree | 8660484c9e23bf93623abf326f3d9b787b86f43d /indra/llui/lllayoutstack.cpp | |
| parent | fdaa7c3798efd070ac1f4ce707303f7f4ae89ea7 (diff) | |
| parent | c308dacfe26fa67e5871ba174dbc0c6cc545a6dd (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/james/gooey
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) |