diff options
| author | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
| commit | 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 (patch) | |
| tree | d8f5c98644029dd289a97aa0d8b55c5a6200c214 /indra/newview/llrootview.h | |
| parent | 2c722655bd6701a3dc8518c6518c51f538765dcd (diff) | |
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
Diffstat (limited to 'indra/newview/llrootview.h')
| -rw-r--r-- | indra/newview/llrootview.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llrootview.h b/indra/newview/llrootview.h index af9517f922..f704fecddd 100644 --- a/indra/newview/llrootview.h +++ b/indra/newview/llrootview.h @@ -36,20 +36,16 @@ #include "llview.h" #include "lluictrlfactory.h" -class LLRootViewRegistry : public LLWidgetRegistry<LLRootViewRegistry> +class LLRootViewRegistry : public LLChildRegistry<LLRootViewRegistry> {}; class LLRootView : public LLView { public: + typedef LLRootViewRegistry child_registry_t; + LLRootView(const Params& p) : LLView(p) {} - - const widget_registry_t& getChildRegistry() const - { - // use default widget registry - return LLRootViewRegistry::instance(); - } }; #endif //LL_LLROOTVIEW_H |