diff options
author | callum <none@none> | 2009-11-10 15:51:41 -0800 |
---|---|---|
committer | callum <none@none> | 2009-11-10 15:51:41 -0800 |
commit | c50072b5482bea46f62931e075f811fbce92293d (patch) | |
tree | f76f50b8d3327e270df511d56d7da9482f903010 /indra/llui/lluictrlfactory.h | |
parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) |
Merge with tip
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
-rw-r--r-- | indra/llui/lluictrlfactory.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index 17e32dc7a9..8a9c9e23c1 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -188,10 +188,15 @@ public: T* widget = new T(params); widget->initFromParams(params); if (parent) - widget->setParent(parent); + { + connect(parent, widget); + } return widget; } + // fix for gcc template instantiation annoyance + static void connect(LLView* parent, LLView* child); + LLView* createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename, const widget_registry_t&, LLXMLNodePtr output_node ); template<typename T> |