Skip to content
Snippets Groups Projects
Commit cf485a38 authored by Tofu Linden's avatar Tofu Linden
Browse files

more fiddling and tracing.

parent e90e8e8f
No related branches found
No related tags found
No related merge requests found
...@@ -228,7 +228,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p) ...@@ -228,7 +228,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
{ {
LLButton::Params p_button; LLButton::Params p_button;
p_button.name(std::string("play_media")); 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; TOOLTIP_PLAYBUTTON_SIZE = 16;
LLRect button_rect; LLRect button_rect;
button_rect.setOriginAndSize((mPadding +TOOLTIP_ICON_SIZE+ mPadding ), mPadding, TOOLTIP_ICON_SIZE, TOOLTIP_ICON_SIZE); button_rect.setOriginAndSize((mPadding +TOOLTIP_ICON_SIZE+ mPadding ), mPadding, TOOLTIP_ICON_SIZE, TOOLTIP_ICON_SIZE);
......
...@@ -162,7 +162,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect) ...@@ -162,7 +162,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
mBtnVolume = getChild<LLButton>( "volume_btn" ); mBtnVolume = getChild<LLButton>( "volume_btn" );
mBtnVolume->setClickedCallback( onClickVolume, this ); 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)); gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
......
...@@ -47,6 +47,7 @@ class LLUICtrl; ...@@ -47,6 +47,7 @@ class LLUICtrl;
class LLUUID; class LLUUID;
class LLFrameTimer; class LLFrameTimer;
class LLStatGraph; class LLStatGraph;
class LLPanelVolumePulldown;
class LLStatusBar class LLStatusBar
: public LLPanel : public LLPanel
...@@ -86,7 +87,7 @@ class LLStatusBar ...@@ -86,7 +87,7 @@ class LLStatusBar
S32 getSquareMetersCommitted() const; S32 getSquareMetersCommitted() const;
S32 getSquareMetersLeft() const; S32 getSquareMetersLeft() const;
LLPanel *mPanelVolume; LLPanelVolumePulldown *mPanelVolume;
private: private:
// simple method to setup the part that holds the date // simple method to setup the part that holds the date
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
width="16" /> width="16" />
<panel <panel
class="panel_volume_pulldown" class="panel_volume_pulldown"
filename="panel_volume_pulldown.xml"
follows="all" follows="all"
height="533" height="533"
layout="topleft" layout="topleft"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment