diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-11-11 15:50:43 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-11-11 15:50:43 -0800 |
| commit | eda34b82ee20ce43362b3fb20e809f97cc8c0081 (patch) | |
| tree | 7f5142526f4f9e01de71e8206b6b482b2e0ed242 /indra | |
| parent | 8519205533a45603e7ac7ecf397d23d041addf9a (diff) | |
Remove references to media_panel_scroll in LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 5c3c260549..bb2ded7ca5 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -271,7 +271,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"); @@ -330,7 +330,7 @@ void LLPanelPrimMediaControls::updateShape() scroll_left_ctrl->setVisible(false); scroll_right_ctrl->setVisible(false); scroll_down_ctrl->setVisible(false); - media_panel_scroll->setVisible(false); +// media_panel_scroll->setVisible(false); F32 volume = media_impl->getVolume(); // movie's url changed @@ -427,7 +427,7 @@ void LLPanelPrimMediaControls::updateShape() scroll_left_ctrl->setVisible(has_focus); scroll_right_ctrl->setVisible(has_focus); scroll_down_ctrl->setVisible(has_focus); - media_panel_scroll->setVisible(has_focus); +// media_panel_scroll->setVisible(has_focus); // TODO: get the secure lock bool from media plug in std::string prefix = std::string("https://"); std::string test_prefix = mCurrentURL.substr(0, prefix.length()); |