diff options
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.h')
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h index ee228e8425..9367c2a629 100644 --- a/indra/newview/llviewerparcelmediaautoplay.h +++ b/indra/newview/llviewerparcelmediaautoplay.h @@ -5,21 +5,21 @@ * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -33,20 +33,20 @@ // timer to automatically play media class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerParcelMediaAutoPlay> { - LLSINGLETON(LLViewerParcelMediaAutoPlay); + LLSINGLETON(LLViewerParcelMediaAutoPlay); public: - virtual BOOL tick() override; - static void playStarted(); + bool tick() override; + static void playStarted(); private: // for askToPlay - static void onStartMediaResponse(const LLUUID ®ion_id, const S32 &parcel_id, const std::string &url, const bool &play); + static void onStartMediaResponse(const LLUUID ®ion_id, const S32 &parcel_id, const std::string &url, const bool &play); private: - S32 mLastParcelID; - LLUUID mLastRegionID; - BOOL mPlayed; - F32 mTimeInParcel; + S32 mLastParcelID; + LLUUID mLastRegionID; + BOOL mPlayed; + F32 mTimeInParcel; }; |