From 5612f13dc8693d89cb5c89f8b1a15115742fba8d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 2 Sep 2009 02:59:07 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453 --- indra/llui/llscrollcontainer.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/llui/llscrollcontainer.cpp') 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 r("scroll_container") #include "llscrollingpanellist.h" #include "llcontainerview.h" #include "llpanel.h" +#include "lllistctrl.h" + static ScrollContainerRegistry::Register r1("scrolling_panel_list"); static ScrollContainerRegistry::Register r2("container_view"); static ScrollContainerRegistry::Register r3("panel", &LLPanel::fromXML); +static ScrollContainerRegistry::Register r4("list"); LLScrollContainer::Params::Params() : is_opaque("opaque"), -- cgit v1.2.3