diff options
| author | Richard Linden <none@none> | 2011-09-27 09:41:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-27 09:41:09 -0700 |
| commit | f0095ddd23b46932ba0aef6bf62918c816ebb09c (patch) | |
| tree | 3d89b3dff1305ab2f15a83eab360bc56234314dc /indra/llui/llview.h | |
| parent | b7cf5ff947161d0b7e42a9ed8fe10741bb7af100 (diff) | |
| parent | c5d930b280c71dfd6ba2f63960c91895083ecc19 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 7a1b2e4ba0..9039366e7e 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -95,9 +95,6 @@ private: static std::vector<LLViewDrawContext*> sDrawContextStack; }; -class LLViewWidgetRegistry : public LLChildRegistry<LLViewWidgetRegistry> -{}; - class LLView : public LLMouseHandler, public LLMortician, public LLFocusableElement { public: @@ -150,7 +147,8 @@ public: Params(); }; - typedef LLViewWidgetRegistry child_registry_t; + // most widgets are valid children of LLView + typedef LLDefaultChildRegistry child_registry_t; void initFromParams(const LLView::Params&); |