From 6a3e8353a7c0e80e2a4558e3a3a345646788981e Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 11 Nov 2009 16:32:54 -0800
Subject: Fix merge error (and hence build breakage :( )

---
 indra/newview/llpanelprimmediacontrols.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

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");
-- 
cgit v1.2.3