diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-11 16:32:54 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-11 16:32:54 -0800 |
| commit | 6a3e8353a7c0e80e2a4558e3a3a345646788981e (patch) | |
| tree | 8b4a58b39e9c1be39a8c39b0c3df903fc3833a68 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 4a376104f16e54651db298128f9c8f740e72bd83 (diff) | |
Fix merge error (and hence build breakage :( )
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index c2c8c6c48e..24de2dcdfc 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -283,7 +283,7 @@ void LLPanelPrimMediaControls::updateShape() LLIconCtrl* whitelist_icon = getChild<LLIconCtrl>("media_whitelist_flag"); LLIconCtrl* secure_lock_icon = getChild<LLIconCtrl>("media_secure_lock_flag"); -// LLUICtrl* media_panel_scroll = getChild<LLUICtrl>("media_panel_scroll"); + LLUICtrl* media_panel_scroll = getChild<LLUICtrl>("media_panel_scroll"); LLUICtrl* scroll_up_ctrl = getChild<LLUICtrl>("scrollup"); LLUICtrl* scroll_left_ctrl = getChild<LLUICtrl>("scrollleft"); LLUICtrl* scroll_right_ctrl = getChild<LLUICtrl>("scrollright"); |