ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.

Browse Source
This commit is contained in:
MW
2007-08-09 12:59:42 +00:00
parent 50e3797c59
commit a56a17fab2
9 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Communications.Caches
lock (this.SendingTextures)
{
this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
// this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
}
}
}
@@ -634,7 +634,8 @@ namespace OpenSim.Framework.Communications.Caches
public class TextureSender
{
public AssetRequest request;
private int counter = 0;
public TextureSender(AssetRequest req)
{
request = req;
@@ -644,8 +645,9 @@ namespace OpenSim.Framework.Communications.Caches
public bool SendTexture()
{
SendPacket();
counter++;
if ((request.PacketCounter > request.NumPackets) |(request.NumPackets ==1))
if ((request.PacketCounter > request.NumPackets) | (counter >120) |(request.NumPackets ==1))
{
return true;
}

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@@ -304,7 +304,7 @@ namespace OpenSim.Region.Capabilities
private LLUUID newAssetID;
private LLUUID inventoryItemID;
private BaseHttpServer httpListener;
private bool SaveAssets = false;
private bool SaveAssets = true;
private string m_assetName = "";
/// <summary>

4
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@@ -187,10 +187,10 @@ namespace OpenSim.Framework.Interfaces
void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint );
AgentCircuitData RequestClientInfo();
void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint );
void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL );
void SendMapBlock(List<MapBlockData> mapBlocks);
void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags);
void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL);
void SendTeleportCancel();
void SendTeleportLocationStart();
void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);

4
OpenSim/Framework/General/NullClientAPI.cs
View File

@@ -118,10 +118,10 @@ namespace OpenSim.Framework
public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}
public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}
public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); }
public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){}
public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL){}
public virtual void SendMapBlock(List<MapBlockData> mapBlocks){}
public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){}
public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){}
public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL){}
public virtual void SendTeleportCancel(){}
public virtual void SendTeleportLocationStart(){}
public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}