diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:25:39 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:25:39 -0700 |
commit | 2812d0f19c8bac908815e6387a7697c51e66ef7f (patch) | |
tree | 181f9ba535d989a770930243c53eb0c8e37600e2 | |
parent | 6e8c5d206ef72357bea7354f88248f671092bc0e (diff) |
DEV-40210 : restructure media controls UI
This change completely restructures the media controls XUI
so that it is now more flexible so as to implement mini vs.
standard controls. It also now allows for changes based
on artwork and design still as unyet delivered from 80/20,
as well as any feedback from Brian's user testing.
This is also step 1 of renaming the media "hud" to media "controls"
-rw-r--r-- | indra/newview/llviewermediafocus.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llviewermediafocus.h | 4 |
2 files changed, 3 insertions, 3 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); } diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index c77533ba5a..959b2381e4 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -40,7 +40,7 @@ #include "llselectmgr.h" class LLViewerMediaImpl; -class LLPanelMediaHUD; +class LLPanelMediaControls; class LLViewerMediaFocus : public LLFocusableElement, @@ -88,7 +88,7 @@ protected: private: - LLHandle<LLPanelMediaHUD> mMediaHUD; + LLHandle<LLPanelMediaControls> mMediaHUD; LLUUID mFocusedObjectID; S32 mFocusedObjectFace; |