From 35df5441d3e2789663532c948731aff3a1e04728 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 14 Jun 2010 12:04:49 +0200
Subject: llmediaplugins first step

---
 linden/indra/newview/llpanelavatar.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'linden/indra/newview/llpanelavatar.h')

diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 72a47f5..b687cd8 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -36,7 +36,7 @@
 #include "llpanel.h"
 #include "v3dmath.h"
 #include "lluuid.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 class LLButton;
 class LLCheckBoxCtrl;
@@ -55,7 +55,7 @@ class LLViewerImage;
 class LLViewerObject;
 class LLMessageSystem;
 class LLIconCtrl;
-class LLWebBrowserCtrl;
+class LLMediaCtrl;
 
 enum EOnlineStatus
 {
@@ -137,13 +137,15 @@ private:
 // WARNING!  The order of the inheritance here matters!!  Do not change.  - KLW
 class LLPanelAvatarWeb : 
 	public LLPanelAvatarTab
-	, public LLWebBrowserCtrlObserver
+	, public LLViewerMediaObserver
 {
 public:
 	LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
 	/*virtual*/ ~LLPanelAvatarWeb();
 	/*virtual*/ BOOL	postBuild(void);
 
+	/*virtual*/ void refresh();
+
 	void enableControls(BOOL own_avatar);
 
 	void setWebURL(std::string url);
@@ -154,13 +156,13 @@ public:
 	static void onCommitURL(LLUICtrl* ctrl, void* data);
 	static void onClickWebProfileHelp(void *);
 
-	// browser observer impls
-	virtual void onStatusTextChange( const EventType& eventIn );
-	virtual void onLocationChange( const EventType& eventIn );
+	// inherited from LLViewerMediaObserver
+	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
 private:
 	std::string			mHome;
-	LLWebBrowserCtrl*	mWebBrowser;
+	std::string         mNavigateTo;
+	LLMediaCtrl*		mWebBrowser;
 };
 
 
-- 
cgit v1.1