more fiddling and tracing.

meow-7.2.2
Tofu Linden 2009-11-27 12:58:45 +00:00
parent e90e8e8f77
commit cf485a384b
4 changed files with 4 additions and 4 deletions

View File

@ -228,7 +228,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
{
LLButton::Params p_button;
p_button.name(std::string("play_media"));
p_button.label(""); // provid label but set to empty so name does not overwrite it -angela
p_button.label(""); // provide label but set to empty so name does not overwrite it -angela
TOOLTIP_PLAYBUTTON_SIZE = 16;
LLRect button_rect;
button_rect.setOriginAndSize((mPadding +TOOLTIP_ICON_SIZE+ mPadding ), mPadding, TOOLTIP_ICON_SIZE, TOOLTIP_ICON_SIZE);

View File

@ -162,7 +162,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
mBtnVolume = getChild<LLButton>( "volume_btn" );
mBtnVolume->setClickedCallback( onClickVolume, this );
mPanelVolume = getChild<LLPanel>( "volume_pulldown" );
mPanelVolume = getChild<LLPanelVolumePulldown>( "volume_pulldown" );
gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));

View File

@ -47,6 +47,7 @@ class LLUICtrl;
class LLUUID;
class LLFrameTimer;
class LLStatGraph;
class LLPanelVolumePulldown;
class LLStatusBar
: public LLPanel
@ -86,7 +87,7 @@ public:
S32 getSquareMetersCommitted() const;
S32 getSquareMetersLeft() const;
LLPanel *mPanelVolume;
LLPanelVolumePulldown *mPanelVolume;
private:
// simple method to setup the part that holds the date

View File

@ -83,7 +83,6 @@
width="16" />
<panel
class="panel_volume_pulldown"
filename="panel_volume_pulldown.xml"
follows="all"
height="533"
layout="topleft"