diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2009-10-28 18:13:00 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2009-10-28 18:13:00 -0700 |
commit | ba5377025be8ceb03b1649f30dd9b83c687763ff (patch) | |
tree | d434baa83cdd08a1792488fbeef36f4cf0e57a16 /indra/newview/llviewermediafocus.cpp | |
parent | 6a9de7c8ee7d3be289fbd42741a327d42b6ea9eb (diff) | |
parent | 62bd0f36f8f993ad235e4d4a13c77bf83dfa6470 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
-rw-r--r-- | indra/newview/llviewermediafocus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index b47e0b8406..174dcb3410 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -329,7 +329,7 @@ void LLViewerMediaFocus::update() // Make sure the media HUD object exists. if(! mMediaHUD.get()) { - LLPanelMediaHUD* media_hud = new LLPanelMediaHUD(); + LLPanelMediaControls* media_hud = new LLPanelMediaControls(); mMediaHUD = media_hud->getHandle(); gHUDView->addChild(media_hud); } |