diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
| commit | 5d43bc166d011e911e0492579b2f4f8bf015b48f (patch) | |
| tree | ccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/llprimitive/material_codes.h | |
| parent | a3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/llprimitive/material_codes.h')
| -rw-r--r-- | indra/llprimitive/material_codes.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/llprimitive/material_codes.h b/indra/llprimitive/material_codes.h index 84a6f2edd2..bad3345425 100644 --- a/indra/llprimitive/material_codes.h +++ b/indra/llprimitive/material_codes.h @@ -1,25 +1,25 @@ -/** +/** * @file material_codes.h * @brief Material_codes definitions * * $LicenseInfo:firstyear=2000&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$ */ @@ -29,17 +29,17 @@ class LLUUID; - // material types -const U8 LL_MCODE_STONE = 0; -const U8 LL_MCODE_METAL = 1; -const U8 LL_MCODE_GLASS = 2; -const U8 LL_MCODE_WOOD = 3; -const U8 LL_MCODE_FLESH = 4; -const U8 LL_MCODE_PLASTIC = 5; -const U8 LL_MCODE_RUBBER = 6; -const U8 LL_MCODE_LIGHT = 7; + // material types +const U8 LL_MCODE_STONE = 0; +const U8 LL_MCODE_METAL = 1; +const U8 LL_MCODE_GLASS = 2; +const U8 LL_MCODE_WOOD = 3; +const U8 LL_MCODE_FLESH = 4; +const U8 LL_MCODE_PLASTIC = 5; +const U8 LL_MCODE_RUBBER = 6; +const U8 LL_MCODE_LIGHT = 7; const U8 LL_MCODE_END = 8; -const U8 LL_MCODE_MASK = 0x0F; +const U8 LL_MCODE_MASK = 0x0F; // *NOTE: Define these in .cpp file to reduce duplicate instances extern const LLUUID LL_DEFAULT_STONE_UUID; |