summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-08 14:28:31 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-08 14:28:31 -0700
commit76001ce3f0b53391c674f315855017b78a3a2873 (patch)
treea2c74f15dcf8c611ce87c4cb6c3a5751e9b8d9e3 /indra/llui/llscrollcontainer.cpp
parent40743eaf99c9cbfee08f0bb44bc7c614bc660f34 (diff)
parent2ed83382a1dd84575536c16e248a602ba96755cd (diff)
Merge
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
-rw-r--r--indra/llui/llscrollcontainer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index 13f862f3af..556ff80991 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -66,9 +66,12 @@ static LLDefaultChildRegistry::Register<LLScrollContainer> r("scroll_container")
#include "llscrollingpanellist.h"
#include "llcontainerview.h"
#include "llpanel.h"
+#include "lllistctrl.h"
+
static ScrollContainerRegistry::Register<LLScrollingPanelList> r1("scrolling_panel_list");
static ScrollContainerRegistry::Register<LLContainerView> r2("container_view");
static ScrollContainerRegistry::Register<LLPanel> r3("panel", &LLPanel::fromXML);
+static ScrollContainerRegistry::Register<LLListCtrl> r4("list");
LLScrollContainer::Params::Params()
: is_opaque("opaque"),