diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-21 10:44:13 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-21 10:44:13 -0800 |
| commit | 2ebd9b54af332c653917c2b38000f30817dbe364 (patch) | |
| tree | c292dd7e4d093686a2dccdfb3e5fce2c40a0f823 /indra/llui/llfloater.cpp | |
| parent | 16ae542f5ae3d00fd5ffe744914af0506bed68c2 (diff) | |
| parent | 5d8442f05613a4b7bc2b1ffb88e2450a4de965ea (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index f7fd2dbdfe..d7a692ec9b 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2717,7 +2717,7 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o } params.from_xui = true; - setupParams(params, parent); + applyXUILayout(params, parent); initFromParams(params); initFloater(params); |