From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/llhudview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llhudview.cpp') diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp index cead4dbce6..e30d5e8759 100644 --- a/indra/newview/llhudview.cpp +++ b/indra/newview/llhudview.cpp @@ -62,11 +62,11 @@ void LLHUDView::draw() } /*virtual*/ -BOOL LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask) +bool LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask) { if (LLTracker::handleMouseDown(x, y)) { - return TRUE; + return true; } return LLView::handleMouseDown(x, y, mask); } -- 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/llhudview.cpp | 144 ++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'indra/newview/llhudview.cpp') diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp index c0a9670b3d..23fdf4b0fd 100644 --- a/indra/newview/llhudview.cpp +++ b/indra/newview/llhudview.cpp @@ -1,72 +1,72 @@ -/** - * @file llhudview.cpp - * @brief 2D HUD overlay - * - * $LicenseInfo:firstyear=2003&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$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llhudview.h" - -// library includes -#include "v4color.h" -#include "llcoord.h" - -// viewer includes -#include "llcallingcard.h" -#include "llviewercontrol.h" -#include "llfloaterworldmap.h" -#include "llworldmapview.h" -#include "lltracker.h" -#include "llviewercamera.h" -#include "llui.h" -#include "lluictrlfactory.h" - -LLHUDView *gHUDView = NULL; - -LLHUDView::LLHUDView(const LLRect& r) -{ - buildFromFile( "panel_hud.xml"); - setShape(r, true); -} - -LLHUDView::~LLHUDView() -{ -} - -// virtual -void LLHUDView::draw() -{ - LLTracker::drawHUDArrow(); - LLView::draw(); -} - -/*virtual*/ -bool LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask) -{ - if (LLTracker::handleMouseDown(x, y)) - { - return true; - } - return LLView::handleMouseDown(x, y, mask); -} +/** + * @file llhudview.cpp + * @brief 2D HUD overlay + * + * $LicenseInfo:firstyear=2003&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$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llhudview.h" + +// library includes +#include "v4color.h" +#include "llcoord.h" + +// viewer includes +#include "llcallingcard.h" +#include "llviewercontrol.h" +#include "llfloaterworldmap.h" +#include "llworldmapview.h" +#include "lltracker.h" +#include "llviewercamera.h" +#include "llui.h" +#include "lluictrlfactory.h" + +LLHUDView *gHUDView = NULL; + +LLHUDView::LLHUDView(const LLRect& r) +{ + buildFromFile( "panel_hud.xml"); + setShape(r, true); +} + +LLHUDView::~LLHUDView() +{ +} + +// virtual +void LLHUDView::draw() +{ + LLTracker::drawHUDArrow(); + LLView::draw(); +} + +/*virtual*/ +bool LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask) +{ + if (LLTracker::handleMouseDown(x, y)) + { + return true; + } + return LLView::handleMouseDown(x, y, mask); +} -- cgit v1.2.3