diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-18 16:08:39 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-18 16:08:39 -0800 |
commit | aa7efb7540d9eed9d8832bb65c52c3fdb1b811c8 (patch) | |
tree | d74df2438d1d62b6c2c683a12bcd42d8dee6e41b /indra/llui/lllayoutstack.cpp | |
parent | 043407238a4162c0d20413338cf6a7088be1f674 (diff) | |
parent | 4964ca39f14531630ffbfece593f8ba9cdc86e4e (diff) |
merge.
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rw-r--r-- | indra/llui/lllayoutstack.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 1fb618adee..5e15fa3919 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -246,6 +246,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o output_node, output_params, &default_params); } + p.from_xui = true; setupParams(p, parent); LLLayoutStack* layout_stackp = LLUICtrlFactory::create<LLLayoutStack>(p); |