diff options
author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/newview/floatervoicelicense.h | |
parent | Changed version to Experimental 2010.09.18 (diff) | |
download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz |
llmediaplugins first step
Diffstat (limited to 'linden/indra/newview/floatervoicelicense.h')
-rw-r--r-- | linden/indra/newview/floatervoicelicense.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/floatervoicelicense.h b/linden/indra/newview/floatervoicelicense.h index 4130d22..9d2012d 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 | #include "llwebbrowserctrl.h" | 38 | //imprudence fixme: removed for media plugins #include "llwebbrowserctrl.h" |
39 | 39 | /* | |
40 | class LLButton; | 40 | class LLButton; |
41 | class LLRadioGroup; | 41 | class LLRadioGroup; |
42 | class LLVFS; | 42 | class LLVFS; |
@@ -45,7 +45,7 @@ class LLUUID; | |||
45 | 45 | ||
46 | class FloaterVoiceLicense : | 46 | class FloaterVoiceLicense : |
47 | public LLModalDialog, | 47 | public LLModalDialog, |
48 | public LLWebBrowserCtrlObserver, | 48 | public LLViewerMediaObserver |
49 | public LLFloaterSingleton<FloaterVoiceLicense> | 49 | public LLFloaterSingleton<FloaterVoiceLicense> |
50 | { | 50 | { |
51 | public: | 51 | public: |
@@ -67,6 +67,6 @@ public: | |||
67 | private: | 67 | private: |
68 | int mWebBrowserWindowId; | 68 | int mWebBrowserWindowId; |
69 | int mLoadCompleteCount; | 69 | int mLoadCompleteCount; |
70 | }; | 70 | };*/ |
71 | 71 | ||
72 | #endif // FLOATERVOICELICENSE_H | 72 | #endif // FLOATERVOICELICENSE_H |