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/llvlmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llvlmanager.cpp') diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp index 895ceed880..b8f41fa197 100644 --- a/indra/newview/llvlmanager.cpp +++ b/indra/newview/llvlmanager.cpp @@ -89,7 +89,7 @@ void LLVLManager::unpackData(const S32 num_packets) decode_patch_group_header(bit_pack, &goph); if (LAND_LAYER_CODE == datap->mType) { - datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE); + datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, false); } else if (WIND_LAYER_CODE == datap->mType) { -- 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/llvlmanager.cpp | 336 +++++++++++++++++++++--------------------- 1 file changed, 168 insertions(+), 168 deletions(-) (limited to 'indra/newview/llvlmanager.cpp') diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp index cbaeb66e59..c2bcd32921 100644 --- a/indra/newview/llvlmanager.cpp +++ b/indra/newview/llvlmanager.cpp @@ -1,168 +1,168 @@ -/** - * @file llvlmanager.cpp - * @brief LLVLManager class implementation - * - * $LicenseInfo:firstyear=2002&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 "llvlmanager.h" - -#include "indra_constants.h" -#include "patch_code.h" -#include "patch_dct.h" -#include "llviewerregion.h" -#include "llframetimer.h" -#include "llsurface.h" -#include "llbitpack.h" - -const char LAND_LAYER_CODE = 'L'; -const char WIND_LAYER_CODE = '7'; -const char CLOUD_LAYER_CODE = '8'; - -LLVLManager gVLManager; - -LLVLManager::~LLVLManager() -{ - S32 i; - for (i = 0; i < mPacketData.size(); i++) - { - delete mPacketData[i]; - } - mPacketData.clear(); -} - -void LLVLManager::addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size) -{ - if (LAND_LAYER_CODE == vl_datap->mType) - { - mLandBits += mesg_size; - } - else if (WIND_LAYER_CODE == vl_datap->mType) - { - mWindBits += mesg_size; - } - else if (CLOUD_LAYER_CODE == vl_datap->mType) - { - mCloudBits += mesg_size; - } - else - { - LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL; - } - - mPacketData.push_back(vl_datap); -} - -void LLVLManager::unpackData(const S32 num_packets) -{ - static LLFrameTimer decode_timer; - - S32 i; - for (i = 0; i < mPacketData.size(); i++) - { - LLVLData *datap = mPacketData[i]; - - LLBitPack bit_pack(datap->mData, datap->mSize); - LLGroupHeader goph; - - decode_patch_group_header(bit_pack, &goph); - if (LAND_LAYER_CODE == datap->mType) - { - datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, false); - } - else if (WIND_LAYER_CODE == datap->mType) - { - datap->mRegionp->mWind.decompress(bit_pack, &goph); - - } - else if (CLOUD_LAYER_CODE == datap->mType) - { - - } - } - - for (i = 0; i < mPacketData.size(); i++) - { - delete mPacketData[i]; - } - mPacketData.clear(); - -} - -void LLVLManager::resetBitCounts() -{ - mLandBits = mWindBits = mCloudBits = (S32Bits)0; -} - -U32Bits LLVLManager::getLandBits() const -{ - return mLandBits; -} - -U32Bits LLVLManager::getWindBits() const -{ - return mWindBits; -} - -U32Bits LLVLManager::getCloudBits() const -{ - return mCloudBits; -} - -S32Bytes LLVLManager::getTotalBytes() const -{ - return mLandBits + mWindBits + mCloudBits; -} - -void LLVLManager::cleanupData(LLViewerRegion *regionp) -{ - S32 cur = 0; - while (cur < mPacketData.size()) - { - if (mPacketData[cur]->mRegionp == regionp) - { - delete mPacketData[cur]; - mPacketData.erase(mPacketData.begin() + cur); - } - else - { - cur++; - } - } -} - -LLVLData::LLVLData(LLViewerRegion *regionp, const S8 type, U8 *data, const S32 size) -{ - mType = type; - mData = data; - mRegionp = regionp; - mSize = size; -} - -LLVLData::~LLVLData() -{ - delete [] mData; - mData = NULL; - mRegionp = NULL; -} +/** + * @file llvlmanager.cpp + * @brief LLVLManager class implementation + * + * $LicenseInfo:firstyear=2002&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 "llvlmanager.h" + +#include "indra_constants.h" +#include "patch_code.h" +#include "patch_dct.h" +#include "llviewerregion.h" +#include "llframetimer.h" +#include "llsurface.h" +#include "llbitpack.h" + +const char LAND_LAYER_CODE = 'L'; +const char WIND_LAYER_CODE = '7'; +const char CLOUD_LAYER_CODE = '8'; + +LLVLManager gVLManager; + +LLVLManager::~LLVLManager() +{ + S32 i; + for (i = 0; i < mPacketData.size(); i++) + { + delete mPacketData[i]; + } + mPacketData.clear(); +} + +void LLVLManager::addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size) +{ + if (LAND_LAYER_CODE == vl_datap->mType) + { + mLandBits += mesg_size; + } + else if (WIND_LAYER_CODE == vl_datap->mType) + { + mWindBits += mesg_size; + } + else if (CLOUD_LAYER_CODE == vl_datap->mType) + { + mCloudBits += mesg_size; + } + else + { + LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL; + } + + mPacketData.push_back(vl_datap); +} + +void LLVLManager::unpackData(const S32 num_packets) +{ + static LLFrameTimer decode_timer; + + S32 i; + for (i = 0; i < mPacketData.size(); i++) + { + LLVLData *datap = mPacketData[i]; + + LLBitPack bit_pack(datap->mData, datap->mSize); + LLGroupHeader goph; + + decode_patch_group_header(bit_pack, &goph); + if (LAND_LAYER_CODE == datap->mType) + { + datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, false); + } + else if (WIND_LAYER_CODE == datap->mType) + { + datap->mRegionp->mWind.decompress(bit_pack, &goph); + + } + else if (CLOUD_LAYER_CODE == datap->mType) + { + + } + } + + for (i = 0; i < mPacketData.size(); i++) + { + delete mPacketData[i]; + } + mPacketData.clear(); + +} + +void LLVLManager::resetBitCounts() +{ + mLandBits = mWindBits = mCloudBits = (S32Bits)0; +} + +U32Bits LLVLManager::getLandBits() const +{ + return mLandBits; +} + +U32Bits LLVLManager::getWindBits() const +{ + return mWindBits; +} + +U32Bits LLVLManager::getCloudBits() const +{ + return mCloudBits; +} + +S32Bytes LLVLManager::getTotalBytes() const +{ + return mLandBits + mWindBits + mCloudBits; +} + +void LLVLManager::cleanupData(LLViewerRegion *regionp) +{ + S32 cur = 0; + while (cur < mPacketData.size()) + { + if (mPacketData[cur]->mRegionp == regionp) + { + delete mPacketData[cur]; + mPacketData.erase(mPacketData.begin() + cur); + } + else + { + cur++; + } + } +} + +LLVLData::LLVLData(LLViewerRegion *regionp, const S8 type, U8 *data, const S32 size) +{ + mType = type; + mData = data; + mRegionp = regionp; + mSize = size; +} + +LLVLData::~LLVLData() +{ + delete [] mData; + mData = NULL; + mRegionp = NULL; +} -- cgit v1.2.3