OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests 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.

afrisby
MW 2007-08-09 12:59:42 +00:00
parent 50e3797c59
commit a56a17fab2
9 changed files with 31 additions and 27 deletions
Show Stats 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) lock (this.SendingTextures)
{ {
this.SendingTextures.Remove(sender.request.ImageInfo.FullID); 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 class TextureSender
{ {
public AssetRequest request; public AssetRequest request;
private int counter = 0;
public TextureSender(AssetRequest req) public TextureSender(AssetRequest req)
{ {
request = req; request = req;
@ -644,8 +645,9 @@ namespace OpenSim.Framework.Communications.Caches
public bool SendTexture() public bool SendTexture()
{ {
SendPacket(); SendPacket();
counter++;
if ((request.PacketCounter > request.NumPackets) |(request.NumPackets ==1)) if ((request.PacketCounter > request.NumPackets) | (counter >120) |(request.NumPackets ==1))
{ {
return true; return true;
} }

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

@ -304,7 +304,7 @@ namespace OpenSim.Region.Capabilities
private LLUUID newAssetID; private LLUUID newAssetID;
private LLUUID inventoryItemID; private LLUUID inventoryItemID;
private BaseHttpServer httpListener; private BaseHttpServer httpListener;
private bool SaveAssets = false; private bool SaveAssets = true;
private string m_assetName = ""; private string m_assetName = "";
/// <summary> /// <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 MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint );
AgentCircuitData RequestClientInfo(); 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 SendMapBlock(List<MapBlockData> mapBlocks);
void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); 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 SendTeleportCancel();
void SendTeleportLocationStart(); void SendTeleportLocationStart();
void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); 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 MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}
public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}
public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } 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 SendMapBlock(List<MapBlockData> mapBlocks){}
public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} 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 SendTeleportCancel(){}
public virtual void SendTeleportLocationStart(){} public virtual void SendTeleportLocationStart(){}
public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}

2
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim
{ {
startupSource = new IniConfigSource(iniFilePath); startupSource = new IniConfigSource(iniFilePath);
//enable follow line, if we want the original config source(normally commandline args) merged with ini file settings. //enable following line, if we want the original config source(normally commandline args) merged with ini file settings.
//in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value. //in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value.
//(as if someone has bothered to enter a command line arg, we should take notice of it) //(as if someone has bothered to enter a command line arg, we should take notice of it)
//startupSource.Merge(configSource); //startupSource.Merge(configSource);

18
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -383,11 +383,11 @@ namespace OpenSim.Region.ClientStack
agentData.child = false; agentData.child = false;
agentData.firstname = this.firstName; agentData.firstname = this.firstName;
agentData.lastname = this.lastName; agentData.lastname = this.lastName;
agentData.CapsPath=m_authenticateSessionsHandler.AgentCircuits[this.CircuitCode].CapsPath; agentData.CapsPath = "";
return agentData; return agentData;
} }
public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint) public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint, string capsURL)
{ {
LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);
@ -407,14 +407,9 @@ namespace OpenSim.Region.ClientStack
newSimPack.RegionData.SimIP += (uint)byteIP[0]; newSimPack.RegionData.SimIP += (uint)byteIP[0];
newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port; newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port;
//newSimPack.RegionData.SeedCapability = new byte[0]; //newSimPack.RegionData.SeedCapability = new byte[0];
newSimPack.RegionData.SeedCapability = Helpers.StringToField(capsURL);
string capsPath = "http://" + externalIPEndPoint.Address.ToString() + ":9000/CAPS/" + m_authenticateSessionsHandler.AgentCircuits[this.CircuitCode].CapsPath +"0000/";
System.Text.ASCIIEncoding enc=new System.Text.ASCIIEncoding();
newSimPack.RegionData.SeedCapability = enc.GetBytes(capsPath);
this.OutPacket(newSimPack); this.OutPacket(newSimPack);
//this.DowngradeClient();
} }
public void SendMapBlock(List<MapBlockData> mapBlocks) public void SendMapBlock(List<MapBlockData> mapBlocks)
@ -450,17 +445,14 @@ namespace OpenSim.Region.ClientStack
OutPacket(tpLocal); OutPacket(tpLocal);
} }
public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags) public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags, string capsURL)
{ {
TeleportFinishPacket teleport = new TeleportFinishPacket(); TeleportFinishPacket teleport = new TeleportFinishPacket();
teleport.Info.AgentID = this.AgentID; teleport.Info.AgentID = this.AgentID;
teleport.Info.RegionHandle = regionHandle; teleport.Info.RegionHandle = regionHandle;
teleport.Info.SimAccess = simAccess; teleport.Info.SimAccess = simAccess;
string capsPath = "http://" + newRegionEndPoint.Address.ToString() + ":9000/CAPS/" + m_authenticateSessionsHandler.AgentCircuits[this.CircuitCode].CapsPath + "0000/"; teleport.Info.SeedCapability = Helpers.StringToField(capsURL);
System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
teleport.Info.SeedCapability = enc.GetBytes(capsPath);
//teleport.Info.SeedCapability = new byte[0]; //teleport.Info.SeedCapability = new byte[0];
IPAddress oIP = newRegionEndPoint.Address; IPAddress oIP = newRegionEndPoint.Address;

11
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -75,6 +75,10 @@ namespace OpenSim.Region.Environment.Scenes
#region Properties #region Properties
public AgentCircuitManager AuthenticateHandler
{
get { return this.authenticateHandler; }
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -600,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes
client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
// client.OnCreateNewInventoryItem += CreateNewInventoryItem; //client.OnCreateNewInventoryItem += CreateNewInventoryItem;
//client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder;
client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents;
client.OnRequestTaskInventory += RequestTaskInventory; client.OnRequestTaskInventory += RequestTaskInventory;
@ -922,7 +926,10 @@ namespace OpenSim.Region.Environment.Scenes
commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false);
remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4)); //TODO: following line is hard coded to port 9000, really need to change this as soon as possible
AgentCircuitData circuitdata = remoteClient.RequestClientInfo();
string capsPath = "http://" + reg.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" + this.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/";
remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath);
} }
} }
} }

5
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -620,7 +620,10 @@ namespace OpenSim.Region.Environment.Scenes
bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying);
if (res) if (res)
{ {
this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint); //TODO: following line is hard coded to port 9000, really need to change this as soon as possible
AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo();
string capsPath = "http://" + neighbourRegion.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" +this.m_scene.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/";
this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath);
this.MakeChildAgent(); this.MakeChildAgent();
} }
} }

4
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -132,10 +132,10 @@ namespace SimpleApp
public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) { } public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) { }
public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint) { } public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint) { }
public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } 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 SendMapBlock(List<MapBlockData> mapBlocks) { }
public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) { } 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 SendTeleportCancel() { }
public virtual void SendTeleportLocationStart() { } public virtual void SendTeleportLocationStart() { }
public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) { } public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) { }