aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/floatervoicelicense.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/floatervoicelicense.h')
-rw-r--r--linden/indra/newview/floatervoicelicense.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/floatervoicelicense.h b/linden/indra/newview/floatervoicelicense.h
index 9d2012d..30dbb2f 100644
--- a/linden/indra/newview/floatervoicelicense.h
+++ b/linden/indra/newview/floatervoicelicense.h
@@ -35,8 +35,8 @@
35 35
36#include "llmodaldialog.h" 36#include "llmodaldialog.h"
37#include "llassetstorage.h" 37#include "llassetstorage.h"
38//imprudence fixme: removed for media plugins #include "llwebbrowserctrl.h" 38#include "llmediactrl.h"
39/* 39
40class LLButton; 40class LLButton;
41class LLRadioGroup; 41class LLRadioGroup;
42class LLVFS; 42class LLVFS;
@@ -45,7 +45,7 @@ class LLUUID;
45 45
46class FloaterVoiceLicense : 46class FloaterVoiceLicense :
47 public LLModalDialog, 47 public LLModalDialog,
48 public LLViewerMediaObserver 48 public LLViewerMediaObserver,
49 public LLFloaterSingleton<FloaterVoiceLicense> 49 public LLFloaterSingleton<FloaterVoiceLicense>
50{ 50{
51public: 51public:
@@ -62,11 +62,12 @@ public:
62 62
63 void setSiteIsAlive( bool alive ); 63 void setSiteIsAlive( bool alive );
64 64
65 virtual void onNavigateComplete( const EventType& eventIn ); 65 // inherited from LLViewerMediaObserver
66 /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
66 67
67private: 68private:
68 int mWebBrowserWindowId; 69 int mWebBrowserWindowId;
69 int mLoadCompleteCount; 70 int mLoadCompleteCount;
70};*/ 71};
71 72
72#endif // FLOATERVOICELICENSE_H 73#endif // FLOATERVOICELICENSE_H