diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-14 14:23:06 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-14 14:23:06 -0700 |
| commit | c224e589d072e733ec5b95f95b3770d5bf0584f0 (patch) | |
| tree | e406d90fe1637b604d1fca0ef7e3e5e002b161ef /indra/llui | |
| parent | 93ed1489a5da6781c6bdd5ee2263e6b6147835c8 (diff) | |
EXP-1272 FIX Move "How To" to a separate web floater
added missing file and updated size of floater
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index fa533e8153..d1d840729d 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3048,7 +3048,9 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::str return FALSE; } - parser.readXUI(referenced_xml, params, LLUICtrlFactory::getInstance()->getCurFileName()); + Params referenced_params; + parser.readXUI(referenced_xml, referenced_params, LLUICtrlFactory::getInstance()->getCurFileName()); + params.fillFrom(referenced_params); // add children using dimensions from referenced xml for consistent layout setShape(params.rect); |