aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertos.h
diff options
context:
space:
mode:
authorArmin Weatherwax2010-06-14 12:04:49 +0200
committerArmin Weatherwax2010-09-23 15:38:25 +0200
commit35df5441d3e2789663532c948731aff3a1e04728 (patch)
treeac7674289784a5f96106ea507637055a8dada78a /linden/indra/newview/llfloatertos.h
parentChanged version to Experimental 2010.09.18 (diff)
downloadmeta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip
meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz
meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2
meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz
llmediaplugins first step
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatertos.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloatertos.h b/linden/indra/newview/llfloatertos.h
index dbec3ff..c5d5878 100644
--- a/linden/indra/newview/llfloatertos.h
+++ b/linden/indra/newview/llfloatertos.h
@@ -35,7 +35,7 @@
35 35
36#include "llmodaldialog.h" 36#include "llmodaldialog.h"
37#include "llassetstorage.h" 37#include "llassetstorage.h"
38#include "llwebbrowserctrl.h" 38#include "llmediactrl.h"
39 39
40class LLButton; 40class LLButton;
41class LLRadioGroup; 41class LLRadioGroup;
@@ -45,7 +45,7 @@ class LLUUID;
45 45
46class LLFloaterTOS : 46class LLFloaterTOS :
47 public LLModalDialog, 47 public LLModalDialog,
48 public LLWebBrowserCtrlObserver 48 public LLViewerMediaObserver
49{ 49{
50public: 50public:
51 virtual ~LLFloaterTOS(); 51 virtual ~LLFloaterTOS();
@@ -70,7 +70,8 @@ public:
70 70
71 void setSiteIsAlive( bool alive ); 71 void setSiteIsAlive( bool alive );
72 72
73 virtual void onNavigateComplete( const EventType& eventIn ); 73 // inherited from LLViewerMediaObserver
74 /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
74 75
75private: 76private:
76 // Asset_id is overwritten with LLUUID::null when agree is clicked. 77 // Asset_id is overwritten with LLUUID::null when agree is clicked.