diff options
author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Region/Environment/Modules/Agent | |
parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
download | opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2 opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz |
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index 2f9a691..5b6c2a6 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |||
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
174 | { | 174 | { |
175 | // for now (testing) we only support files under 1000 bytes | 175 | // for now (testing) we only support files under 1000 bytes |
176 | byte[] transferData = new byte[Data.Length + 4]; | 176 | byte[] transferData = new byte[Data.Length + 4]; |
177 | Array.Copy(Helpers.IntToBytes(Data.Length), 0, transferData, 0, 4); | 177 | Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4); |
178 | Array.Copy(Data, 0, transferData, 4, Data.Length); | 178 | Array.Copy(Data, 0, transferData, 4, Data.Length); |
179 | Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); | 179 | Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); |
180 | 180 | ||
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
183 | else | 183 | else |
184 | { | 184 | { |
185 | byte[] transferData = new byte[1000 + 4]; | 185 | byte[] transferData = new byte[1000 + 4]; |
186 | Array.Copy(Helpers.IntToBytes(Data.Length), 0, transferData, 0, 4); | 186 | Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4); |
187 | Array.Copy(Data, 0, transferData, 4, 1000); | 187 | Array.Copy(Data, 0, transferData, 4, 1000); |
188 | Client.SendXferPacket(XferID, 0, transferData); | 188 | Client.SendXferPacket(XferID, 0, transferData); |
189 | Packet++; | 189 | Packet++; |