svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release

QAR-275 Parcel Media

Sam made me do it.

1 files changed, 32 insertions, 0 deletions

diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
new file mode 100644
index 0000000000..20b132c827
--- /dev/null
+++ b/indra/newview/llviewerparcelmediaautoplay.h
@@ -0,0 +1,32 @@
+/**
+ * @file llviewerparcelmediaautoplay.h
+ * @author Karl Stiefvater
+ * @brief timer to automatically play media in a parcel
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+#ifndef LLVIEWERPARCELMEDIAAUTOPLAY_H
+#define LLVIEWERPARCELMEDIAAUTOPLAY_H
+
+#include "llmediabase.h"
+#include "lltimer.h"
+
+// timer to automatically play media
+class LLViewerParcelMediaAutoPlay : LLEventTimer
+{
+ public:
+	LLViewerParcelMediaAutoPlay();
+	virtual BOOL tick();
+	static void initClass();
+	static void cleanupClass();
+	static void playStarted();
+	
+ private:
+	S32 mLastParcelID;
+	BOOL mPlayed;
+	F32 mTimeInParcel;
+};
+
+
+#endif // LLVIEWERPARCELMEDIAAUTOPLAY_H