From ac451485d6809e52e893cf7f443046c41617fa0b Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 17 Dec 2008 16:47:38 +0000 Subject: [PATCH] * minor: Remove unused AppearanceTableMapper as pointed out by jonc in http://opensimulator.org/mantis/view.php?id=2843 --- OpenSim/Data/Base/AppearanceTableMapper.cs | 284 ------------------ .../Modules/Avatar/Friends/FriendsModule.cs | 1 + 2 files changed, 1 insertion(+), 284 deletions(-) delete mode 100644 OpenSim/Data/Base/AppearanceTableMapper.cs diff --git a/OpenSim/Data/Base/AppearanceTableMapper.cs b/OpenSim/Data/Base/AppearanceTableMapper.cs deleted file mode 100644 index c1bb739b34..0000000000 --- a/OpenSim/Data/Base/AppearanceTableMapper.cs +++ /dev/null @@ -1,284 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using OpenMetaverse; -using OpenSim.Data.Base; -using OpenSim.Framework; - -namespace OpenSim.Data.Base -{ - /// - /// - /// - public class AppearanceRowMapper : BaseRowMapper - { - public AppearanceRowMapper(BaseSchema schema, AvatarAppearance obj) - : base(schema, obj) - { - } - } - - /// - /// - /// - public class AppearanceTableMapper : BaseTableMapper - { - public AppearanceTableMapper(BaseDatabaseConnector database, string tableName) - : base(database, tableName) - { - BaseSchema rowMapperSchema = new BaseSchema(this); - m_schema = rowMapperSchema; - - m_keyFieldMapper = rowMapperSchema.AddMapping("UUID", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("Serial", - delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; }, - delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; }); - - rowMapperSchema.AddMapping("WearableItem0", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { - if (mapper.Object.Wearables == null) - { - mapper.Object.Wearables = new AvatarWearable[13]; - for (int i = 0; i < 13; i++) - { - mapper.Object.Wearables[i] = new AvatarWearable(); - } - } - mapper.Object.Wearables[0].ItemID = new UUID(value.ToString()); - }); - - rowMapperSchema.AddMapping("WearableAsset0", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[0].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem1", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset1", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[1].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem2", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset2", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[2].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem3", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset3", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[3].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem4", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset4", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[4].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem5", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset5", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[5].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem6", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset6", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[6].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem7", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset7", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[7].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem8", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset8", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[8].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem9", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset9", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[9].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem10", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset10", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[10].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem11", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset11", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[11].AssetID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableItem12", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new UUID(value.ToString()); }); - - rowMapperSchema.AddMapping("WearableAsset12", - delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.Guid; }, - delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[12].AssetID = new UUID(value.ToString()); }); - - } - - /// - /// - /// - /// - /// - /// - public bool Add(Guid userID, AvatarAppearance appearance) - { - AppearanceRowMapper mapper = CreateRowMapper(appearance); - return Add(mapper); - } - - /// - /// - /// - /// - /// - /// - public bool Update(Guid userID, AvatarAppearance appearance) - { - AppearanceRowMapper mapper = CreateRowMapper(appearance); - return Update(appearance.Owner.Guid, mapper); - } - - /// - /// - /// - /// - /// - protected AppearanceRowMapper CreateRowMapper(AvatarAppearance appearance) - { - return new AppearanceRowMapper(m_schema, appearance); - } - - /// - /// - /// - /// - protected AppearanceRowMapper CreateRowMapper() - { - return CreateRowMapper(new AvatarAppearance()); - } - - /// - /// - /// - /// - /// - /// - protected AppearanceRowMapper FromReader(BaseDataReader reader, AvatarAppearance appearance) - { - AppearanceRowMapper mapper = CreateRowMapper(appearance); - mapper.FiPrimitive(reader); - return mapper; - } - - /// - /// - /// - /// - /// - public override AppearanceRowMapper FromReader(BaseDataReader reader) - { - AppearanceRowMapper mapper = CreateRowMapper(); - mapper.FiPrimitive(reader); - return mapper; - } - - /// - /// - /// - /// - /// - /// - public bool TryGetValue(Guid presenceID, out AvatarAppearance val) - { - AppearanceRowMapper mapper; - if (TryGetValue(presenceID, out mapper)) - { - val = mapper.Object; - return true; - } - else - { - val = null; - return false; - } - } - } -} diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index f8f66d6929..6a8141a71d 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs @@ -24,6 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + using System; using System.Collections; using System.Collections.Generic;