diff options
| author | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
| commit | 6bbd490107abe162c114ccd990636ae6b16f46f8 (patch) | |
| tree | 13d7f4c1da1f28fe7ed8b73bcea82cea35ba9526 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
| parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 68522ffac3..6552a296b6 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -119,7 +119,7 @@ LLPanelPrimMediaControls::LLPanelPrimMediaControls() : mCommitCallbackRegistrar.add("MediaCtrl.SkipBack", boost::bind(&LLPanelPrimMediaControls::onClickSkipBack, this)); mCommitCallbackRegistrar.add("MediaCtrl.SkipForward", boost::bind(&LLPanelPrimMediaControls::onClickSkipForward, this)); - buildPanel(this, "panel_prim_media_controls.xml"); + buildFromFile( "panel_prim_media_controls.xml"); mInactivityTimer.reset(); mFadeTimer.stop(); mCurrentZoom = ZOOM_NONE; |