From 9626acce584391fc90d147310917a1569610d224 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 8 Dec 2008 01:00:18 -0600 Subject: Moved enum EWearableType to its own file. Was in newview/llwearable.h, now in llinventory/llwearabletype.h. This allows it to be used in llinventory code. --- ChangeLog.txt | 10 ++++++ linden/indra/llinventory/llwearabletype.h | 54 +++++++++++++++++++++++++++++++ linden/indra/newview/llwearable.h | 20 +----------- 3 files changed, 65 insertions(+), 19 deletions(-) create mode 100644 linden/indra/llinventory/llwearabletype.h diff --git a/ChangeLog.txt b/ChangeLog.txt index 1f5eddc..0d72966 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,13 @@ +2008-12-08 Jacek Antonelli + + * linden/indra/llinventory/llwearabletype.h: + Moved enum EWearableType to its own file. + Was in newview/llwearable.h, now in llinventory/llwearabletype.h. + This allows it to be used in llinventory code. + * linden/indra/newview/llwearable.h: + Ditto. + + 2008-12-07 Jacek Antonelli * linden/indra/llinventory/llinventory.cpp: diff --git a/linden/indra/llinventory/llwearabletype.h b/linden/indra/llinventory/llwearabletype.h new file mode 100644 index 0000000..b0a40b2 --- /dev/null +++ b/linden/indra/llinventory/llwearabletype.h @@ -0,0 +1,54 @@ +/** + * @file llwearable.h + * @brief EWearableType enum definition + * + * $LicenseInfo:firstyear=2002&license=viewergpl$ + * + * Copyright (c) 2002-2008, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#ifndef LL_LLWEARABLETYPE_H +#define LL_LLWEARABLETYPE_H + +enum EWearableType // If you change this, update LLWearable::getTypeName(), getTypeLabel(), and LLVOAvatar::getTEWearableType() +{ + WT_SHAPE = 0, + WT_SKIN = 1, + WT_HAIR = 2, + WT_EYES = 3, + WT_SHIRT = 4, + WT_PANTS = 5, + WT_SHOES = 6, + WT_SOCKS = 7, + WT_JACKET = 8, + WT_GLOVES = 9, + WT_UNDERSHIRT = 10, + WT_UNDERPANTS = 11, + WT_SKIRT = 12, + WT_COUNT = 13, + WT_INVALID = 255 +}; + +#endif // LL_LLWEARABLETYPE_H diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h index c5f9d06..00a53d3 100644 --- a/linden/indra/newview/llwearable.h +++ b/linden/indra/newview/llwearable.h @@ -37,28 +37,10 @@ #include "llpermissions.h" #include "llsaleinfo.h" #include "llassetstorage.h" +#include "llwearabletype.h" class LLViewerInventoryItem; -enum EWearableType // If you change this, update LLWearable::getTypeName(), getTypeLabel(), and LLVOAvatar::getTEWearableType() -{ - WT_SHAPE = 0, - WT_SKIN = 1, - WT_HAIR = 2, - WT_EYES = 3, - WT_SHIRT = 4, - WT_PANTS = 5, - WT_SHOES = 6, - WT_SOCKS = 7, - WT_JACKET = 8, - WT_GLOVES = 9, - WT_UNDERSHIRT = 10, - WT_UNDERPANTS = 11, - WT_SKIRT = 12, - WT_COUNT = 13, - WT_INVALID = 255 -}; - class LLWearable { friend class LLWearableList; -- cgit v1.1