diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
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, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index eaf2198..8e90d17 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |||
@@ -41,6 +41,10 @@ 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 | |||
44 | #region IRegionModule Members | 48 | #region IRegionModule Members |
45 | 49 | ||
46 | public void Initialise(Scene scene, IConfigSource config) | 50 | public void Initialise(Scene scene, IConfigSource config) |
@@ -145,11 +149,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
145 | public IClientAPI Client; | 149 | public IClientAPI Client; |
146 | private bool complete; | 150 | private bool complete; |
147 | public byte[] Data = new byte[0]; | 151 | public byte[] Data = new byte[0]; |
148 | public int DataPointer; | 152 | public int DataPointer = 0; |
149 | public string FileName = String.Empty; | 153 | public string FileName = String.Empty; |
150 | public uint Packet; | 154 | public uint Packet = 0; |
151 | public uint Serial = 1; | 155 | public uint Serial = 1; |
152 | public ulong XferID; | 156 | public ulong XferID = 0; |
153 | 157 | ||
154 | public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client) | 158 | public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client) |
155 | { | 159 | { |
@@ -213,7 +217,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
213 | { | 217 | { |
214 | byte[] transferData = new byte[Data.Length - DataPointer]; | 218 | byte[] transferData = new byte[Data.Length - DataPointer]; |
215 | Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer); | 219 | Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer); |
216 | uint endPacket = Packet |= 0x80000000; | 220 | uint endPacket = Packet |= (uint) 0x80000000; |
217 | Client.SendXferPacket(XferID, endPacket, transferData); | 221 | Client.SendXferPacket(XferID, endPacket, transferData); |
218 | Packet++; | 222 | Packet++; |
219 | DataPointer += (Data.Length - DataPointer); | 223 | DataPointer += (Data.Length - DataPointer); |