automated merge

1 files changed, 9 insertions, 37 deletions

diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h
index bfed2f259b..b1963309da 100644
--- a/indra/newview/llfloaterevent.h
+++ b/indra/newview/llfloaterevent.h
@@ -28,17 +28,15 @@
 #define LL_LLFLOATEREVENT_H
 
 #include "llfloater.h"
-#include "lleventinfo.h"
-#include "lluuid.h"
-#include "v3dmath.h"
+#include "llviewermediaobserver.h"
 
-class LLTextBox;
-class LLTextEditor;
+
+class LLMediaCtrl;
 class LLButton;
-class LLExpandableTextBox;
-class LLMessageSystem;
 
-class LLFloaterEvent : public LLFloater
+class LLFloaterEvent : public LLFloater,
+                       public LLViewerMediaObserver
+
 {
 public:
 	LLFloaterEvent(const LLSD& key);
@@ -48,44 +46,18 @@ public:
 	/*virtual*/ void draw();
 
 	void setEventID(const U32 event_id);
-	void sendEventInfoRequest();
-
-	static void processEventInfoReply(LLMessageSystem *msg, void **);
 
 	U32 getEventID() { return mEventID; }
 
-protected:
-	void resetInfo();
-
-	static void onClickTeleport(void*);
-	static void onClickMap(void*);
-	//static void onClickLandmark(void*);
-	static void onClickCreateEvent(void*);
-	static void onClickNotify(void*);
-	void onClickDeleteEvent();
-
-	static void regionInfoCallback(U32 event_id, U64 region_handle);
 
 
 protected:
+	/*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event);	
+	
 	U32				mEventID;
-	LLEventInfo		mEventInfo;
-
-	LLTextBox*		mTBName;
-	LLTextBox*		mTBCategory;
-	LLTextBox*		mTBDate;
-	LLTextBox*		mTBDuration;
-	LLExpandableTextBox*	mTBDesc;
 
-	LLTextBox*		mTBRunBy;
-	LLTextBox*		mTBLocation;
-	LLTextBox*		mTBCover;
+	LLMediaCtrl*	mBrowser;
 
-	LLButton*		mTeleportBtn;
-	LLButton*		mMapBtn;
-	LLButton*		mCreateEventBtn;
-	LLButton*		mGodDeleteEventBtn;
-	LLButton*		mNotifyBtn;
 };
 
 #endif // LL_LLFLOATEREVENT_H