Merge recent changes

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 26d8cc824e..c2d4d2c861 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;
@@ -101,10 +105,8 @@ public:
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
 
-	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