diff options
Diffstat (limited to 'linden/indra/newview/llvieweruictrlfactory.cpp')
-rw-r--r-- | linden/indra/newview/llvieweruictrlfactory.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/linden/indra/newview/llvieweruictrlfactory.cpp b/linden/indra/newview/llvieweruictrlfactory.cpp index efab1cc..188c905 100644 --- a/linden/indra/newview/llvieweruictrlfactory.cpp +++ b/linden/indra/newview/llvieweruictrlfactory.cpp | |||
@@ -41,7 +41,6 @@ | |||
41 | #include "llnameeditor.h" | 41 | #include "llnameeditor.h" |
42 | #include "llnamelistctrl.h" | 42 | #include "llnamelistctrl.h" |
43 | #include "llwebbrowserctrl.h" | 43 | #include "llwebbrowserctrl.h" |
44 | #include "llvolumesliderctrl.h" | ||
45 | #include "lljoystickbutton.h" | 44 | #include "lljoystickbutton.h" |
46 | #include "llmediaremotectrl.h" | 45 | #include "llmediaremotectrl.h" |
47 | #include "v4color.h" | 46 | #include "v4color.h" |
@@ -66,7 +65,6 @@ LLViewerUICtrlFactory::LLViewerUICtrlFactory() | |||
66 | #if LL_LIBXUL_ENABLED | 65 | #if LL_LIBXUL_ENABLED |
67 | LLUICtrlCreator<LLWebBrowserCtrl>::registerCreator(LL_WEB_BROWSER_CTRL_TAG, this); | 66 | LLUICtrlCreator<LLWebBrowserCtrl>::registerCreator(LL_WEB_BROWSER_CTRL_TAG, this); |
68 | #endif | 67 | #endif |
69 | LLUICtrlCreator<LLVolumeSliderCtrl>::registerCreator(LL_VOLUME_SLIDER_CTRL_TAG, this); | ||
70 | LLUICtrlCreator<LLJoystickAgentSlide>::registerCreator(LL_JOYSTICK_SLIDE, this); | 68 | LLUICtrlCreator<LLJoystickAgentSlide>::registerCreator(LL_JOYSTICK_SLIDE, this); |
71 | LLUICtrlCreator<LLJoystickAgentTurn>::registerCreator(LL_JOYSTICK_TURN, this); | 69 | LLUICtrlCreator<LLJoystickAgentTurn>::registerCreator(LL_JOYSTICK_TURN, this); |
72 | LLUICtrlCreator<LLMediaRemoteCtrl>::registerCreator(LL_MEDIA_REMOTE_CTRL_TAG, this); | 70 | LLUICtrlCreator<LLMediaRemoteCtrl>::registerCreator(LL_MEDIA_REMOTE_CTRL_TAG, this); |
@@ -103,11 +101,6 @@ LLWebBrowserCtrl* LLViewerUICtrlFactory::getWebBrowserByName(LLPanel* panelp, co | |||
103 | return (LLWebBrowserCtrl*)panelp->getCtrlByNameAndType(name, WIDGET_TYPE_WEBBROWSER); | 101 | return (LLWebBrowserCtrl*)panelp->getCtrlByNameAndType(name, WIDGET_TYPE_WEBBROWSER); |
104 | } | 102 | } |
105 | 103 | ||
106 | LLVolumeSliderCtrl* LLViewerUICtrlFactory::getVolumeSliderByName(LLPanel* panelp, const LLString& name) | ||
107 | { | ||
108 | return (LLVolumeSliderCtrl*)panelp->getCtrlByNameAndType(name, WIDGET_TYPE_VOLUME_SLIDER); | ||
109 | } | ||
110 | |||
111 | LLViewerTextEditor* LLViewerUICtrlFactory::getViewerTextEditorByName(LLPanel* panelp, const LLString& name) | 104 | LLViewerTextEditor* LLViewerUICtrlFactory::getViewerTextEditorByName(LLPanel* panelp, const LLString& name) |
112 | { | 105 | { |
113 | return (LLViewerTextEditor*)panelp->getCtrlByNameAndType(name, WIDGET_TYPE_TEXT_EDITOR); | 106 | return (LLViewerTextEditor*)panelp->getCtrlByNameAndType(name, WIDGET_TYPE_TEXT_EDITOR); |