diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-27 12:58:45 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-27 12:58:45 +0000 |
| commit | cf485a384ba8cd5249ae11949fe3464252f5ba06 (patch) | |
| tree | 4ef35a39cb65498ccc720130410933eb538dc028 | |
| parent | e90e8e8f775ac728d0ac4e191f5a28304a98d253 (diff) | |
more fiddling and tracing.
| -rw-r--r-- | indra/llui/lltooltip.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llstatusbar.h | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_status_bar.xml | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 959313a5b6..d7228c78bd 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -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); diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index c1d8c26dce..ed125e0a59 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -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)); diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index 7be119dd4d..acb211b738 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -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 diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index a296795aed..d3419eec4d 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -83,7 +83,6 @@ width="16" /> <panel class="panel_volume_pulldown" - filename="panel_volume_pulldown.xml" follows="all" height="533" layout="topleft" |