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/llui/llscrollcontainer.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/llui/llscrollcontainer.h')
| -rw-r--r-- | indra/llui/llscrollcontainer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h index 26d8cc824e..9cbfbc94a1 100644 --- a/indra/llui/llscrollcontainer.h +++ b/indra/llui/llscrollcontainer.h @@ -68,6 +68,10 @@ public: Params(); }; + + // my valid children are stored in this registry + typedef LLDefaultChildRegistry child_registry_t; + protected: LLScrollContainer(const Params&); friend class LLUICtrlFactory; @@ -104,7 +108,6 @@ public: virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect); virtual void draw(); virtual bool addChild(LLView* view, S32 tab_group = 0); - virtual const widget_registry_t& getChildRegistry() const; private: // internal scrollbar handlers |