ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Modernized ScriptManager to new interface-based module calls.

Browse Source 
* 'remove redundant this qualifier' ftw
This commit is contained in:
lbsa71
2007-09-19 00:30:55 +00:00
parent 3f6b3f6b59
commit 8f0b03597b
47 changed files with 1455 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenSim/Region/Environment/Modules/XferModule.cs
View File

@@ -1,13 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using System;
using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules
{
public class XferModule : IRegionModule, IXfer
@@ -18,8 +15,7 @@ namespace OpenSim.Region.Environment.Modules
private Scene m_scene;
public XferModule()
{
{
}
public void Initialise(Scene scene)
@@ -31,13 +27,11 @@ namespace OpenSim.Region.Environment.Modules
}
public void PostInitialise()
{
{
}
public void CloseDown()
{
{
}
public string GetName()
@@ -67,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules
lock (NewFiles)
{
if (NewFiles.ContainsKey(fileName))
{
{
if (!Transfers.ContainsKey(xferID))
{
byte[] fileData = NewFiles[fileName];
@@ -82,7 +76,7 @@ namespace OpenSim.Region.Environment.Modules
public void AckPacket(IClientAPI remoteClient, ulong xferID, uint packet)
{
if (this.Transfers.ContainsKey(xferID))
if (Transfers.ContainsKey(xferID))
{
Transfers[xferID].AckPacket(packet);
}
@@ -125,8 +119,7 @@ namespace OpenSim.Region.Environment.Modules
}
public XferDownLoad()
{
{
}
public void StartSend()
@@ -142,10 +135,10 @@ namespace OpenSim.Region.Environment.Modules
}
else
{
byte[] transferData = new byte[1000 +4];
byte[] transferData = new byte[1000 + 4];
Array.Copy(Helpers.IntToBytes(Data.Length), 0, transferData, 0, 4);
Array.Copy(Data, 0, transferData, 4, 1000);
Client.SendXferPacket(XferID, 0 , transferData);
Client.SendXferPacket(XferID, 0, transferData);
Packet++;
DataPointer = 1000;
}
@@ -167,7 +160,7 @@ namespace OpenSim.Region.Environment.Modules
{
byte[] transferData = new byte[Data.Length - DataPointer];
Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer);
uint endPacket = Packet |= (uint)0x80000000;
uint endPacket = Packet |= (uint) 0x80000000;
Client.SendXferPacket(XferID, endPacket, transferData);
Packet++;
DataPointer += (Data.Length - DataPointer);
@@ -177,4 +170,4 @@ namespace OpenSim.Region.Environment.Modules
}
}
}
}
}