livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to media_panel_scroll in LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file.

meow-7.2.2
Monroe Linden 2009-11-11 15:50:43 -08:00
parent 8519205533
commit eda34b82ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelprimmediacontrols.cpp
View File

@ -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());