diff options
author | Richard Linden <none@none> | 2011-09-23 20:06:35 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-09-23 20:06:35 -0700 |
commit | c5d930b280c71dfd6ba2f63960c91895083ecc19 (patch) | |
tree | 82667ed2697747a0cf3d8494bd7294db51f4b0d1 /indra | |
parent | 3b41527537d814c6a59d912bc9e0c37654697a10 (diff) |
made LLView a possible parent for all default widgets
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llui/llpanel.h | 3 | ||||
-rw-r--r-- | indra/llui/llview.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 790025cb2d..ab1c87caff 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -96,9 +96,6 @@ public: Params(); }; - // valid children for LLPanel are stored in this registry - typedef LLDefaultChildRegistry child_registry_t; - protected: friend class LLUICtrlFactory; // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8 diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 594a5eec6b..43986a3a84 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&); |