From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llappearance.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'indra/newview/llappearance.h') diff --git a/indra/newview/llappearance.h b/indra/newview/llappearance.h index 05dfac4e42..10b9c9246e 100644 --- a/indra/newview/llappearance.h +++ b/indra/newview/llappearance.h @@ -1,25 +1,25 @@ -/** +/** * @file llappearance.h * @brief LLAppearance class definition * * $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$ */ @@ -32,20 +32,20 @@ class LLAppearance { public: - LLAppearance() {} - ~LLAppearance() { mParamMap.clear(); } + LLAppearance() {} + ~LLAppearance() { mParamMap.clear(); } + + void addParam( S32 id, F32 value ) { mParamMap[id] = value; } + F32 getParam( S32 id, F32 defval ) { return get_if_there(mParamMap, id, defval ); } - void addParam( S32 id, F32 value ) { mParamMap[id] = value; } - F32 getParam( S32 id, F32 defval ) { return get_if_there(mParamMap, id, defval ); } + void addTexture( S32 te, const LLUUID& uuid ) { if( te < LLAvatarAppearanceDefines::TEX_NUM_INDICES ) mTextures[te] = uuid; } + const LLUUID& getTexture( S32 te ) { return ( te < LLAvatarAppearanceDefines::TEX_NUM_INDICES ) ? mTextures[te] : LLUUID::null; } - void addTexture( S32 te, const LLUUID& uuid ) { if( te < LLAvatarAppearanceDefines::TEX_NUM_INDICES ) mTextures[te] = uuid; } - const LLUUID& getTexture( S32 te ) { return ( te < LLAvatarAppearanceDefines::TEX_NUM_INDICES ) ? mTextures[te] : LLUUID::null; } - - void clear() { mParamMap.clear(); for( S32 i=0; i param_map_t; - param_map_t mParamMap; - LLUUID mTextures[LLAvatarAppearanceDefines::TEX_NUM_INDICES]; + typedef std::map param_map_t; + param_map_t mParamMap; + LLUUID mTextures[LLAvatarAppearanceDefines::TEX_NUM_INDICES]; }; #endif // LL_LLAPPEARANCE_H -- cgit v1.2.3