From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llfloaterevent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterevent.h') diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h index ed90055d95..a0cd7de9e2 100644 --- a/indra/newview/llfloaterevent.h +++ b/indra/newview/llfloaterevent.h @@ -42,7 +42,7 @@ public: LLFloaterEvent(const LLSD& key); /*virtual*/ ~LLFloaterEvent(); - /*virtual*/ BOOL postBuild(); + bool postBuild() override; void setEventID(const U32 event_id); -- cgit v1.2.3 From 0fb52bd372aad468c890fc57f4ae3b8be7dad463 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 21 Feb 2024 03:31:20 +0200 Subject: viewer#848 Xcode buildfix --- indra/newview/llfloaterevent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterevent.h') diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h index a0cd7de9e2..501981a80f 100644 --- a/indra/newview/llfloaterevent.h +++ b/indra/newview/llfloaterevent.h @@ -51,7 +51,7 @@ public: protected: - /*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event); + void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) override; U32 mEventID; -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llfloaterevent.h | 124 ++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'indra/newview/llfloaterevent.h') diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h index 11c0c8504c..3854885a5f 100644 --- a/indra/newview/llfloaterevent.h +++ b/indra/newview/llfloaterevent.h @@ -1,62 +1,62 @@ -/** - * @file llfloaterevent.h - * @brief Display for events in the finder - * - * $LicenseInfo:firstyear=2004&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$ - */ - -#ifndef LL_LLFLOATEREVENT_H -#define LL_LLFLOATEREVENT_H - -#include "llfloater.h" -#include "llviewermediaobserver.h" - - -class LLMediaCtrl; -class LLButton; - -class LLFloaterEvent : public LLFloater, - public LLViewerMediaObserver - -{ -public: - LLFloaterEvent(const LLSD& key); - /*virtual*/ ~LLFloaterEvent(); - - bool postBuild() override; - - void setEventID(const U32 event_id); - - U32 getEventID() { return mEventID; } - - - -protected: - void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) override; - - U32 mEventID; - - LLMediaCtrl* mBrowser; - -}; - -#endif // LL_LLFLOATEREVENT_H +/** + * @file llfloaterevent.h + * @brief Display for events in the finder + * + * $LicenseInfo:firstyear=2004&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$ + */ + +#ifndef LL_LLFLOATEREVENT_H +#define LL_LLFLOATEREVENT_H + +#include "llfloater.h" +#include "llviewermediaobserver.h" + + +class LLMediaCtrl; +class LLButton; + +class LLFloaterEvent : public LLFloater, + public LLViewerMediaObserver + +{ +public: + LLFloaterEvent(const LLSD& key); + /*virtual*/ ~LLFloaterEvent(); + + bool postBuild() override; + + void setEventID(const U32 event_id); + + U32 getEventID() { return mEventID; } + + + +protected: + void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) override; + + U32 mEventID; + + LLMediaCtrl* mBrowser; + +}; + +#endif // LL_LLFLOATEREVENT_H -- cgit v1.2.3