diff options
author | Adam Frisby | 2008-05-01 16:35:00 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:35:00 +0000 |
commit | 13526097f24b7a8ad63b1d482c44b44397fa055f (patch) | |
tree | 7a82c20ed7c63e2aea5ad3863325e37f64e1cbea /OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |
parent | * Breaking all the code, breaking all the code..! (diff) | |
download | opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.zip opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.gz opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.bz2 opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.xz |
* Spring cleaning on Region.Environment.
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index 8e90d17..eaf2198 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |||
@@ -41,10 +41,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
41 | public Dictionary<string, byte[]> NewFiles = new Dictionary<string, byte[]>(); | 41 | public Dictionary<string, byte[]> NewFiles = new Dictionary<string, byte[]>(); |
42 | public Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>(); | 42 | public Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>(); |
43 | 43 | ||
44 | public XferModule() | ||
45 | { | ||
46 | } | ||
47 | |||
48 | #region IRegionModule Members | 44 | #region IRegionModule Members |
49 | 45 | ||
50 | public void Initialise(Scene scene, IConfigSource config) | 46 | public void Initialise(Scene scene, IConfigSource config) |
@@ -149,11 +145,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
149 | public IClientAPI Client; | 145 | public IClientAPI Client; |
150 | private bool complete; | 146 | private bool complete; |
151 | public byte[] Data = new byte[0]; | 147 | public byte[] Data = new byte[0]; |
152 | public int DataPointer = 0; | 148 | public int DataPointer; |
153 | public string FileName = String.Empty; | 149 | public string FileName = String.Empty; |
154 | public uint Packet = 0; | 150 | public uint Packet; |
155 | public uint Serial = 1; | 151 | public uint Serial = 1; |
156 | public ulong XferID = 0; | 152 | public ulong XferID; |
157 | 153 | ||
158 | public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client) | 154 | public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client) |
159 | { | 155 | { |
@@ -217,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
217 | { | 213 | { |
218 | byte[] transferData = new byte[Data.Length - DataPointer]; | 214 | byte[] transferData = new byte[Data.Length - DataPointer]; |
219 | Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer); | 215 | Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer); |
220 | uint endPacket = Packet |= (uint) 0x80000000; | 216 | uint endPacket = Packet |= 0x80000000; |
221 | Client.SendXferPacket(XferID, endPacket, transferData); | 217 | Client.SendXferPacket(XferID, endPacket, transferData); |
222 | Packet++; | 218 | Packet++; |
223 | DataPointer += (Data.Length - DataPointer); | 219 | DataPointer += (Data.Length - DataPointer); |