diff options
| author | callum <none@none> | 2009-12-18 15:15:34 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-18 15:15:34 -0800 |
| commit | 01006749158de1c7c4da89ddad549025f376c6e0 (patch) | |
| tree | fca6888218079c4da17aa1b1d420d4bf231779c3 /indra/llui/lllayoutstack.cpp | |
| parent | fb862f18159d320572008b6a8da81ffd2f109e37 (diff) | |
| parent | 4964ca39f14531630ffbfece593f8ba9cdc86e4e (diff) | |
Merge with tip
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); |