Conflicts: indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two. Compile fixies: indra/newview/llavataractions.cpp needed to include llnotifications.h indra/newview/llvoicechannel.cpp needed to include llnotifications.h
58 lines
1.8 KiB
C++
58 lines
1.8 KiB
C++
/**
|
|
* @file llviewerparcelmediaautoplay.h
|
|
* @brief timer to automatically play media in a parcel
|
|
*
|
|
* $LicenseInfo:firstyear=2007&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2007-2009, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LLVIEWERPARCELMEDIAAUTOPLAY_H
|
|
#define LLVIEWERPARCELMEDIAAUTOPLAY_H
|
|
|
|
#include "lleventtimer.h"
|
|
#include "lluuid.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;
|
|
LLUUID mLastRegionID;
|
|
BOOL mPlayed;
|
|
F32 mTimeInParcel;
|
|
};
|
|
|
|
|
|
#endif // LLVIEWERPARCELMEDIAAUTOPLAY_H
|