From 9e854b697a06abed2a0917fb6120445f176764f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20N=C3=A6sbye=20Christensen?= Date: Fri, 16 Feb 2024 19:29:51 +0100 Subject: misc: BOOL to bool --- indra/newview/llregioninfomodel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llregioninfomodel.h') diff --git a/indra/newview/llregioninfomodel.h b/indra/newview/llregioninfomodel.h index baeff82fef..2aea654de7 100644 --- a/indra/newview/llregioninfomodel.h +++ b/indra/newview/llregioninfomodel.h @@ -70,7 +70,7 @@ public: F32 mTerrainLowerLimit; F32 mSunHour; // 6..30 - BOOL mUseEstateSun; + bool mUseEstateSun; std::string mSimName; std::string mSimType; -- 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/llregioninfomodel.h | 200 +++++++++++++++++++------------------- 1 file changed, 100 insertions(+), 100 deletions(-) (limited to 'indra/newview/llregioninfomodel.h') diff --git a/indra/newview/llregioninfomodel.h b/indra/newview/llregioninfomodel.h index f4314c0fac..08608d6fd8 100644 --- a/indra/newview/llregioninfomodel.h +++ b/indra/newview/llregioninfomodel.h @@ -1,100 +1,100 @@ -/** - * @file llregioninfomodel.h - * @brief Region info model - * - * $LicenseInfo:firstyear=2011&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2011, 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_LLREGIONINFOMODEL_H -#define LL_LLREGIONINFOMODEL_H - -class LLMessageSystem; - -#include "llsingleton.h" - -/** - * Contains region info, notifies interested parties of its changes. - */ -class LLRegionInfoModel : public LLSingleton -{ - LLSINGLETON(LLRegionInfoModel); - LOG_CLASS(LLRegionInfoModel); - -public: - typedef boost::signals2::signal update_signal_t; - boost::signals2::connection setUpdateCallback(const update_signal_t::slot_type& cb); - - void sendRegionTerrain(const LLUUID& invoice) const; /// upload region terrain data - - bool getUseFixedSun() const; - - void setUseFixedSun(bool fixed); - - // *TODO: Add getters and make the data private. - U8 mSimAccess; - U8 mAgentLimit; - - S32 mHardAgentLimit; - - U64 mRegionFlags; - U32 mEstateID; - U32 mParentEstateID; - - S32 mPricePerMeter; - S32 mRedirectGridX; - S32 mRedirectGridY; - - F32 mBillableFactor; - F32 mObjectBonusFactor; - F32 mWaterHeight; - F32 mTerrainRaiseLimit; - F32 mTerrainLowerLimit; - F32 mSunHour; // 6..30 - - bool mUseEstateSun; - - std::string mSimName; - std::string mSimType; - -protected: - friend class LLViewerRegion; - - - /** - * Refresh model with data from the incoming server message. - */ - void update(LLMessageSystem* msg); - -private: - void reset(); - - // *FIXME: Duplicated code from LLPanelRegionInfo - static void sendEstateOwnerMessage( - LLMessageSystem* msg, - const std::string& request, - const LLUUID& invoice, - const std::vector& strings); - - update_signal_t mUpdateSignal; -}; - -#endif // LL_LLREGIONINFOMODEL_H +/** + * @file llregioninfomodel.h + * @brief Region info model + * + * $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2011, 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_LLREGIONINFOMODEL_H +#define LL_LLREGIONINFOMODEL_H + +class LLMessageSystem; + +#include "llsingleton.h" + +/** + * Contains region info, notifies interested parties of its changes. + */ +class LLRegionInfoModel : public LLSingleton +{ + LLSINGLETON(LLRegionInfoModel); + LOG_CLASS(LLRegionInfoModel); + +public: + typedef boost::signals2::signal update_signal_t; + boost::signals2::connection setUpdateCallback(const update_signal_t::slot_type& cb); + + void sendRegionTerrain(const LLUUID& invoice) const; /// upload region terrain data + + bool getUseFixedSun() const; + + void setUseFixedSun(bool fixed); + + // *TODO: Add getters and make the data private. + U8 mSimAccess; + U8 mAgentLimit; + + S32 mHardAgentLimit; + + U64 mRegionFlags; + U32 mEstateID; + U32 mParentEstateID; + + S32 mPricePerMeter; + S32 mRedirectGridX; + S32 mRedirectGridY; + + F32 mBillableFactor; + F32 mObjectBonusFactor; + F32 mWaterHeight; + F32 mTerrainRaiseLimit; + F32 mTerrainLowerLimit; + F32 mSunHour; // 6..30 + + bool mUseEstateSun; + + std::string mSimName; + std::string mSimType; + +protected: + friend class LLViewerRegion; + + + /** + * Refresh model with data from the incoming server message. + */ + void update(LLMessageSystem* msg); + +private: + void reset(); + + // *FIXME: Duplicated code from LLPanelRegionInfo + static void sendEstateOwnerMessage( + LLMessageSystem* msg, + const std::string& request, + const LLUUID& invoice, + const std::vector& strings); + + update_signal_t mUpdateSignal; +}; + +#endif // LL_LLREGIONINFOMODEL_H -- cgit v1.2.3