From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 21 Apr 2008 07:09:17 +0000 Subject: * Optimised using statements and namespace references across entire project (this took a while to run). --- .../Modules/AvatarFactory/AppearanceTableMapper.cs | 63 +++++++++++----------- .../Modules/AvatarFactory/AvatarFactoryModule.cs | 4 +- .../AvatarFactory/Properties/AssemblyInfo.cs | 1 - 3 files changed, 33 insertions(+), 35 deletions(-) (limited to 'OpenSim/Region/Modules/AvatarFactory') diff --git a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs index d6ef1fb..2d9f32f 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs @@ -26,11 +26,10 @@ */ using System; -using System.Collections.Generic; -using System.Text; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Framework; +using libsecondlife; using OpenSim.Data.Base; +using OpenSim.Framework; +using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Modules.AvatarFactory { @@ -52,7 +51,7 @@ namespace OpenSim.Region.Modules.AvatarFactory m_keyFieldMapper = rowMapperSchema.AddMapping("UUID", delegate(AppearanceRowMapper mapper) { return mapper.Object.ScenePresenceID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("Serial", delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.WearablesSerial; }, @@ -64,127 +63,127 @@ namespace OpenSim.Region.Modules.AvatarFactory { if (mapper.Object.Wearables == null) { - mapper.Object.Wearables = new OpenSim.Framework.AvatarWearable[13]; + 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 libsecondlife.LLUUID(value.ToString()); + mapper.Object.Wearables[0].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset0", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[0].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[0].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem1", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset1", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[1].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[1].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem2", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset2", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[2].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[2].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem3", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset3", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[3].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[3].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem4", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset4", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[4].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[4].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem5", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset5", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[5].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[5].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem6", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset6", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[6].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[6].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem7", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset7", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[7].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[7].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem8", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset8", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[8].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[8].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem9", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset9", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[9].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[9].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem10", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset10", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[10].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[10].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem11", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset11", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[11].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[11].AssetID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableItem12", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.UUID; }, - delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new libsecondlife.LLUUID(value.ToString()); }); + delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new LLUUID(value.ToString()); }); rowMapperSchema.AddMapping("WearableAsset12", delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.UUID; }, delegate(AppearanceRowMapper mapper, Guid value) - { mapper.Object.Wearables[12].AssetID = new libsecondlife.LLUUID(value.ToString()); }); + { mapper.Object.Wearables[12].AssetID = new LLUUID(value.ToString()); }); } diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index ae522ef..0ee8848 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs @@ -30,12 +30,12 @@ using System.Collections.Generic; using System.Threading; using libsecondlife; using Nini.Config; +using OpenSim.Data.Base; +using OpenSim.Data.MapperFactory; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using OpenSim.Data.Base; -using OpenSim.Data.MapperFactory; namespace OpenSim.Region.Modules.AvatarFactory { diff --git a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs index ec9714a..a9fe53e 100644 --- a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs @@ -26,7 +26,6 @@ */ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following -- cgit v1.1