From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Wed, 27 Feb 2008 18:58:14 +0000 Subject: Merge of windlight into release (QAR-286). This includes all changes in windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 --- indra/llui/lluictrlfactory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llui/lluictrlfactory.h') diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index 1b90e64322..c2a6cfe510 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -91,6 +91,8 @@ public: static class LLPanel* getPanelByName( const LLPanel* panelp, const LLString& name); static class LLMenuItemCallGL* getMenuItemCallByName( const LLPanel* panelp, const LLString& name); static class LLScrollingPanelList* getScrollingPanelList( const LLPanel* panelp, const LLString& name); + static class LLMultiSliderCtrl* getMultiSliderByName( const LLPanel* panelp, const LLString& name); + static class LLMultiSlider* getMultiSliderBarByName(const LLPanel* panelp, const LLString& name); // interface getters static LLCtrlListInterface* getListInterfaceByName( const LLPanel* panelp, const LLString& name); -- cgit v1.2.3