summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
committerPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
commit85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch)
treedbb248900527cac25c307970fb5c817b90b715e7 /indra/llui
parentee159d8e742a7281f304fc45b692c111706d294e (diff)
parent9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff)
Merge of viewer 2 changes
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lluictrlfactory.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 3643bf44f7..f9e134e1e5 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -459,3 +459,4 @@ void LLUICtrlFactory::connect(LLView* parent, LLView* child)
{
parent->addChild(child);
}
+