diff options
* optimized usings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
4 files changed, 61 insertions, 65 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index c5cffa3..5ae5b4b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -25,22 +25,20 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.IO.Compression; | 31 | using System.IO.Compression; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Xml; | 33 | using System.Text; |
34 | using OpenMetaverse; | 34 | using System.Xml; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using log4net; |
36 | using OpenSim.Region.CoreModules.World.Archiver; | 36 | using OpenMetaverse; |
37 | using OpenSim.Region.CoreModules.World.Serialiser; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Region.CoreModules.World.Archiver; |
41 | using log4net; | 41 | |
42 | |||
43 | |||
44 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 42 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
45 | { | 43 | { |
46 | public class InventoryArchiveReadRequest | 44 | public class InventoryArchiveReadRequest |
@@ -48,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 47 | ||
50 | protected TarArchiveReader archive; | 48 | protected TarArchiveReader archive; |
51 | private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); | 49 | private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
52 | 50 | ||
53 | private string m_firstName; | 51 | private string m_firstName; |
54 | private string m_lastName; | 52 | private string m_lastName; |
@@ -98,13 +96,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
98 | item.ID = UUID.Parse(reader.ReadString()); | 96 | item.ID = UUID.Parse(reader.ReadString()); |
99 | reader.ReadEndElement(); | 97 | reader.ReadEndElement(); |
100 | reader.ReadStartElement("InvType"); | 98 | reader.ReadStartElement("InvType"); |
101 | item.InvType = System.Convert.ToInt32(reader.ReadString()); | 99 | item.InvType = Convert.ToInt32(reader.ReadString()); |
102 | reader.ReadEndElement(); | 100 | reader.ReadEndElement(); |
103 | reader.ReadStartElement("CreatorUUID"); | 101 | reader.ReadStartElement("CreatorUUID"); |
104 | item.Creator = UUID.Parse(reader.ReadString()); | 102 | item.Creator = UUID.Parse(reader.ReadString()); |
105 | reader.ReadEndElement(); | 103 | reader.ReadEndElement(); |
106 | reader.ReadStartElement("CreationDate"); | 104 | reader.ReadStartElement("CreationDate"); |
107 | item.CreationDate = System.Convert.ToInt32(reader.ReadString()); | 105 | item.CreationDate = Convert.ToInt32(reader.ReadString()); |
108 | reader.ReadEndElement(); | 106 | reader.ReadEndElement(); |
109 | reader.ReadStartElement("Owner"); | 107 | reader.ReadStartElement("Owner"); |
110 | item.Owner = UUID.Parse(reader.ReadString()); | 108 | item.Owner = UUID.Parse(reader.ReadString()); |
@@ -121,37 +119,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
121 | reader.ReadEndElement(); | 119 | reader.ReadEndElement(); |
122 | } | 120 | } |
123 | reader.ReadStartElement("AssetType"); | 121 | reader.ReadStartElement("AssetType"); |
124 | item.AssetType = System.Convert.ToInt32(reader.ReadString()); | 122 | item.AssetType = Convert.ToInt32(reader.ReadString()); |
125 | reader.ReadEndElement(); | 123 | reader.ReadEndElement(); |
126 | reader.ReadStartElement("AssetID"); | 124 | reader.ReadStartElement("AssetID"); |
127 | item.AssetID = UUID.Parse(reader.ReadString()); | 125 | item.AssetID = UUID.Parse(reader.ReadString()); |
128 | reader.ReadEndElement(); | 126 | reader.ReadEndElement(); |
129 | reader.ReadStartElement("SaleType"); | 127 | reader.ReadStartElement("SaleType"); |
130 | item.SaleType = System.Convert.ToByte(reader.ReadString()); | 128 | item.SaleType = Convert.ToByte(reader.ReadString()); |
131 | reader.ReadEndElement(); | 129 | reader.ReadEndElement(); |
132 | reader.ReadStartElement("SalePrice"); | 130 | reader.ReadStartElement("SalePrice"); |
133 | item.SalePrice = System.Convert.ToInt32(reader.ReadString()); | 131 | item.SalePrice = Convert.ToInt32(reader.ReadString()); |
134 | reader.ReadEndElement(); | 132 | reader.ReadEndElement(); |
135 | reader.ReadStartElement("BasePermissions"); | 133 | reader.ReadStartElement("BasePermissions"); |
136 | item.BasePermissions = System.Convert.ToUInt32(reader.ReadString()); | 134 | item.BasePermissions = Convert.ToUInt32(reader.ReadString()); |
137 | reader.ReadEndElement(); | 135 | reader.ReadEndElement(); |
138 | reader.ReadStartElement("CurrentPermissions"); | 136 | reader.ReadStartElement("CurrentPermissions"); |
139 | item.CurrentPermissions = System.Convert.ToUInt32(reader.ReadString()); | 137 | item.CurrentPermissions = Convert.ToUInt32(reader.ReadString()); |
140 | reader.ReadEndElement(); | 138 | reader.ReadEndElement(); |
141 | reader.ReadStartElement("EveryOnePermssions"); | 139 | reader.ReadStartElement("EveryOnePermssions"); |
142 | item.EveryOnePermissions = System.Convert.ToUInt32(reader.ReadString()); | 140 | item.EveryOnePermissions = Convert.ToUInt32(reader.ReadString()); |
143 | reader.ReadEndElement(); | 141 | reader.ReadEndElement(); |
144 | reader.ReadStartElement("NextPermissions"); | 142 | reader.ReadStartElement("NextPermissions"); |
145 | item.NextPermissions = System.Convert.ToUInt32(reader.ReadString()); | 143 | item.NextPermissions = Convert.ToUInt32(reader.ReadString()); |
146 | reader.ReadEndElement(); | 144 | reader.ReadEndElement(); |
147 | reader.ReadStartElement("Flags"); | 145 | reader.ReadStartElement("Flags"); |
148 | item.Flags = System.Convert.ToUInt32(reader.ReadString()); | 146 | item.Flags = Convert.ToUInt32(reader.ReadString()); |
149 | reader.ReadEndElement(); | 147 | reader.ReadEndElement(); |
150 | reader.ReadStartElement("GroupID"); | 148 | reader.ReadStartElement("GroupID"); |
151 | item.GroupID = UUID.Parse(reader.ReadString()); | 149 | item.GroupID = UUID.Parse(reader.ReadString()); |
152 | reader.ReadEndElement(); | 150 | reader.ReadEndElement(); |
153 | reader.ReadStartElement("GroupOwned"); | 151 | reader.ReadStartElement("GroupOwned"); |
154 | item.GroupOwned = System.Convert.ToBoolean(reader.ReadString()); | 152 | item.GroupOwned = Convert.ToBoolean(reader.ReadString()); |
155 | reader.ReadEndElement(); | 153 | reader.ReadEndElement(); |
156 | //reader.ReadStartElement("ParentFolderID"); | 154 | //reader.ReadStartElement("ParentFolderID"); |
157 | //item.Folder = UUID.Parse(reader.ReadString()); | 155 | //item.Folder = UUID.Parse(reader.ReadString()); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index bfa4de9..da4785b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -25,20 +25,19 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.IO.Compression; | 31 | using System.IO.Compression; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Xml; | 33 | using System.Xml; |
34 | using OpenMetaverse; | 34 | using log4net; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenMetaverse; |
36 | using OpenSim.Region.CoreModules.World.Archiver; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework.Communications; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Region.CoreModules.World.Archiver; |
40 | using log4net; | 40 | |
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 41 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
43 | { | 42 | { |
44 | public class InventoryArchiveWriteRequest | 43 | public class InventoryArchiveWriteRequest |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index a684b69..b025a31 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -25,17 +25,17 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | 38 | ||
39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index d2cf6c9..98d952c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -25,18 +25,17 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections.Generic; |
30 | using System.Collections.Generic; | 30 | using System.Reflection; |
31 | using System.Reflection; | 31 | using log4net; |
32 | using OpenMetaverse; | 32 | using Nini.Config; |
33 | using log4net; | 33 | using OpenMetaverse; |
34 | using Nini.Config; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Framework.Communications.Cache; | 38 | |
39 | |||
40 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | 39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer |
41 | { | 40 | { |
42 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule | 41 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule |