diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/llui | |
parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/lluictrlfactory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 1c1450d7e9..e5647970f1 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -455,3 +455,4 @@ void LLUICtrlFactory::connect(LLView* parent, LLView* child) { parent->addChild(child); } + |