From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/lldebugview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lldebugview.cpp') diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index dc1c085c88..7f5458103e 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -94,14 +94,14 @@ void LLDebugView::init() gSceneView = new LLSceneView(r); gSceneView->setFollowsTop(); gSceneView->setFollowsLeft(); - gSceneView->setVisible(FALSE); + gSceneView->setVisible(false); addChild(gSceneView); gSceneView->setRect(rect); gSceneMonitorView = new LLSceneMonitorView(r); gSceneMonitorView->setFollowsTop(); gSceneMonitorView->setFollowsLeft(); - gSceneMonitorView->setVisible(FALSE); + gSceneMonitorView->setVisible(false); addChild(gSceneMonitorView); gSceneMonitorView->setRect(rect); @@ -116,7 +116,7 @@ void LLDebugView::init() tvp.visible(false); gTextureView = LLUICtrlFactory::create(tvp); addChild(gTextureView); - //gTextureView->reshape(r.getWidth(), r.getHeight(), TRUE); + //gTextureView->reshape(r.getWidth(), r.getHeight(), true); } void LLDebugView::draw() -- 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/lldebugview.cpp | 268 +++++++++++++++++++++--------------------- 1 file changed, 134 insertions(+), 134 deletions(-) (limited to 'indra/newview/lldebugview.cpp') diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index 3ef5242de0..b88d11886a 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -1,134 +1,134 @@ -/** - * @file lldebugview.cpp - * @brief A view containing UI elements only visible in build mode. - * - * $LicenseInfo:firstyear=2001&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 "lldebugview.h" - -// library includes -#include "llfasttimerview.h" -#include "llconsole.h" -#include "lltextureview.h" -#include "llresmgr.h" -#include "llviewercontrol.h" -#include "llviewerwindow.h" -#include "llappviewer.h" -#include "llsceneview.h" -#include "llviewertexture.h" -#include "llfloaterreg.h" -#include "llscenemonitor.h" -// -// Globals -// - -LLDebugView* gDebugView = NULL; - -// -// Methods -// -static LLDefaultChildRegistry::Register r("debug_view"); - -LLDebugView::LLDebugView(const LLDebugView::Params& p) -: LLView(p), - mFastTimerView(NULL), - mDebugConsolep(NULL), - mFloaterSnapRegion(NULL) -{} - -LLDebugView::~LLDebugView() -{ - // These have already been deleted. Fix the globals appropriately. - gDebugView = NULL; - gTextureView = NULL; - gSceneView = NULL; - gSceneMonitorView = NULL; -} - -void LLDebugView::init() -{ - LLRect r; - LLRect rect = getLocalRect(); - - // Rectangle to draw debug data in (full height, 3/4 width) - r.set(10, rect.getHeight() - 100, ((rect.getWidth()*3)/4), 100); - LLConsole::Params cp; - cp.name("debug console"); - cp.max_lines(20); - cp.rect(r); - cp.font(LLFontGL::getFontMonospace()); - cp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT); - cp.visible(false); - mDebugConsolep = LLUICtrlFactory::create(cp); - addChild(mDebugConsolep); - - r.set(150 - 25, rect.getHeight() - 50, rect.getWidth()/2 - 25, rect.getHeight() - 450); - - r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), - (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); - - mFastTimerView = dynamic_cast(LLFloaterReg::getInstance("block_timers")); - - gSceneView = new LLSceneView(r); - gSceneView->setFollowsTop(); - gSceneView->setFollowsLeft(); - gSceneView->setVisible(false); - addChild(gSceneView); - gSceneView->setRect(rect); - - gSceneMonitorView = new LLSceneMonitorView(r); - gSceneMonitorView->setFollowsTop(); - gSceneMonitorView->setFollowsLeft(); - gSceneMonitorView->setVisible(false); - addChild(gSceneMonitorView); - gSceneMonitorView->setRect(rect); - - r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), - (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); - - r.set(150, rect.getHeight() - 50, 820, 100); - LLTextureView::Params tvp; - tvp.name("gTextureView"); - tvp.rect(r); - tvp.follows.flags(FOLLOWS_TOP|FOLLOWS_LEFT); - tvp.visible(false); - gTextureView = LLUICtrlFactory::create(tvp); - addChild(gTextureView); - //gTextureView->reshape(r.getWidth(), r.getHeight(), true); -} - -void LLDebugView::draw() -{ - if (mFloaterSnapRegion == NULL) - { - mFloaterSnapRegion = getRootView()->getChildView("floater_snap_region"); - } - - LLRect debug_rect; - mFloaterSnapRegion->localRectToOtherView(mFloaterSnapRegion->getLocalRect(), &debug_rect, getParent()); - - setShape(debug_rect); - LLView::draw(); -} +/** + * @file lldebugview.cpp + * @brief A view containing UI elements only visible in build mode. + * + * $LicenseInfo:firstyear=2001&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 "lldebugview.h" + +// library includes +#include "llfasttimerview.h" +#include "llconsole.h" +#include "lltextureview.h" +#include "llresmgr.h" +#include "llviewercontrol.h" +#include "llviewerwindow.h" +#include "llappviewer.h" +#include "llsceneview.h" +#include "llviewertexture.h" +#include "llfloaterreg.h" +#include "llscenemonitor.h" +// +// Globals +// + +LLDebugView* gDebugView = NULL; + +// +// Methods +// +static LLDefaultChildRegistry::Register r("debug_view"); + +LLDebugView::LLDebugView(const LLDebugView::Params& p) +: LLView(p), + mFastTimerView(NULL), + mDebugConsolep(NULL), + mFloaterSnapRegion(NULL) +{} + +LLDebugView::~LLDebugView() +{ + // These have already been deleted. Fix the globals appropriately. + gDebugView = NULL; + gTextureView = NULL; + gSceneView = NULL; + gSceneMonitorView = NULL; +} + +void LLDebugView::init() +{ + LLRect r; + LLRect rect = getLocalRect(); + + // Rectangle to draw debug data in (full height, 3/4 width) + r.set(10, rect.getHeight() - 100, ((rect.getWidth()*3)/4), 100); + LLConsole::Params cp; + cp.name("debug console"); + cp.max_lines(20); + cp.rect(r); + cp.font(LLFontGL::getFontMonospace()); + cp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT); + cp.visible(false); + mDebugConsolep = LLUICtrlFactory::create(cp); + addChild(mDebugConsolep); + + r.set(150 - 25, rect.getHeight() - 50, rect.getWidth()/2 - 25, rect.getHeight() - 450); + + r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), + (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); + + mFastTimerView = dynamic_cast(LLFloaterReg::getInstance("block_timers")); + + gSceneView = new LLSceneView(r); + gSceneView->setFollowsTop(); + gSceneView->setFollowsLeft(); + gSceneView->setVisible(false); + addChild(gSceneView); + gSceneView->setRect(rect); + + gSceneMonitorView = new LLSceneMonitorView(r); + gSceneMonitorView->setFollowsTop(); + gSceneMonitorView->setFollowsLeft(); + gSceneMonitorView->setVisible(false); + addChild(gSceneMonitorView); + gSceneMonitorView->setRect(rect); + + r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), + (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); + + r.set(150, rect.getHeight() - 50, 820, 100); + LLTextureView::Params tvp; + tvp.name("gTextureView"); + tvp.rect(r); + tvp.follows.flags(FOLLOWS_TOP|FOLLOWS_LEFT); + tvp.visible(false); + gTextureView = LLUICtrlFactory::create(tvp); + addChild(gTextureView); + //gTextureView->reshape(r.getWidth(), r.getHeight(), true); +} + +void LLDebugView::draw() +{ + if (mFloaterSnapRegion == NULL) + { + mFloaterSnapRegion = getRootView()->getChildView("floater_snap_region"); + } + + LLRect debug_rect; + mFloaterSnapRegion->localRectToOtherView(mFloaterSnapRegion->getLocalRect(), &debug_rect, getParent()); + + setShape(debug_rect); + LLView::draw(); +} -- cgit v1.2.3