diff options
author | MW | 2007-08-09 12:59:42 +0000 |
---|---|---|
committer | MW | 2007-08-09 12:59:42 +0000 |
commit | a56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch) | |
tree | e19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim | |
parent | Transition between not flying / flying should be smoother (diff) | |
download | opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.zip opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.gz opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.bz2 opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.xz |
Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/General/NullClientAPI.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 4 |
9 files changed, 31 insertions, 27 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index acdd593..3866e21 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
224 | lock (this.SendingTextures) | 224 | lock (this.SendingTextures) |
225 | { | 225 | { |
226 | this.SendingTextures.Remove(sender.request.ImageInfo.FullID); | 226 | this.SendingTextures.Remove(sender.request.ImageInfo.FullID); |
227 | this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); | 227 | // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); |
228 | } | 228 | } |
229 | } | 229 | } |
230 | } | 230 | } |
@@ -634,7 +634,8 @@ namespace OpenSim.Framework.Communications.Caches | |||
634 | public class TextureSender | 634 | public class TextureSender |
635 | { | 635 | { |
636 | public AssetRequest request; | 636 | public AssetRequest request; |
637 | 637 | private int counter = 0; | |
638 | |||
638 | public TextureSender(AssetRequest req) | 639 | public TextureSender(AssetRequest req) |
639 | { | 640 | { |
640 | request = req; | 641 | request = req; |
@@ -644,8 +645,9 @@ namespace OpenSim.Framework.Communications.Caches | |||
644 | public bool SendTexture() | 645 | public bool SendTexture() |
645 | { | 646 | { |
646 | SendPacket(); | 647 | SendPacket(); |
648 | counter++; | ||
647 | 649 | ||
648 | if ((request.PacketCounter > request.NumPackets) |(request.NumPackets ==1)) | 650 | if ((request.PacketCounter > request.NumPackets) | (counter >120) |(request.NumPackets ==1)) |
649 | { | 651 | { |
650 | return true; | 652 | return true; |
651 | } | 653 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 82ef08d..d56cf6f 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Capabilities | |||
304 | private LLUUID newAssetID; | 304 | private LLUUID newAssetID; |
305 | private LLUUID inventoryItemID; | 305 | private LLUUID inventoryItemID; |
306 | private BaseHttpServer httpListener; | 306 | private BaseHttpServer httpListener; |
307 | private bool SaveAssets = false; | 307 | private bool SaveAssets = true; |
308 | private string m_assetName = ""; | 308 | private string m_assetName = ""; |
309 | 309 | ||
310 | /// <summary> | 310 | /// <summary> |
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index da4e03b..fa323ba 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -187,10 +187,10 @@ namespace OpenSim.Framework.Interfaces | |||
187 | void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); | 187 | void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); |
188 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); | 188 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); |
189 | AgentCircuitData RequestClientInfo(); | 189 | AgentCircuitData RequestClientInfo(); |
190 | void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint ); | 190 | void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL ); |
191 | void SendMapBlock(List<MapBlockData> mapBlocks); | 191 | void SendMapBlock(List<MapBlockData> mapBlocks); |
192 | void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); | 192 | void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); |
193 | void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags); | 193 | void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL); |
194 | void SendTeleportCancel(); | 194 | void SendTeleportCancel(); |
195 | void SendTeleportLocationStart(); | 195 | void SendTeleportLocationStart(); |
196 | void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); | 196 | void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); |
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs index bc98cc1..459e12b 100644 --- a/OpenSim/Framework/General/NullClientAPI.cs +++ b/OpenSim/Framework/General/NullClientAPI.cs | |||
@@ -118,10 +118,10 @@ namespace OpenSim.Framework | |||
118 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){} | 118 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){} |
119 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} | 119 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} |
120 | public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } | 120 | public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } |
121 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){} | 121 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL){} |
122 | public virtual void SendMapBlock(List<MapBlockData> mapBlocks){} | 122 | public virtual void SendMapBlock(List<MapBlockData> mapBlocks){} |
123 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} | 123 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} |
124 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){} | 124 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL){} |
125 | public virtual void SendTeleportCancel(){} | 125 | public virtual void SendTeleportCancel(){} |
126 | public virtual void SendTeleportLocationStart(){} | 126 | public virtual void SendTeleportLocationStart(){} |
127 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} | 127 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 248bd42..8e3f558 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim | |||
83 | { | 83 | { |
84 | startupSource = new IniConfigSource(iniFilePath); | 84 | startupSource = new IniConfigSource(iniFilePath); |
85 | 85 | ||
86 | //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings. | 86 | //enable following line, if we want the original config source(normally commandline args) merged with ini file settings. |
87 | //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. | 87 | //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. |
88 | //(as if someone has bothered to enter a command line arg, we should take notice of it) | 88 | //(as if someone has bothered to enter a command line arg, we should take notice of it) |
89 | //startupSource.Merge(configSource); | 89 | //startupSource.Merge(configSource); |
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index a4b0af1..8a2db98 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -383,11 +383,11 @@ namespace OpenSim.Region.ClientStack | |||
383 | agentData.child = false; | 383 | agentData.child = false; |
384 | agentData.firstname = this.firstName; | 384 | agentData.firstname = this.firstName; |
385 | agentData.lastname = this.lastName; | 385 | agentData.lastname = this.lastName; |
386 | agentData.CapsPath=m_authenticateSessionsHandler.AgentCircuits[this.CircuitCode].CapsPath; | 386 | agentData.CapsPath = ""; |
387 | return agentData; | 387 | return agentData; |
388 | } | 388 | } |
389 | 389 | ||
390 | public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint) | 390 | public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint, string capsURL) |
391 | { | 391 | { |
392 | LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); | 392 | LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); |
393 | 393 | ||
@@ -407,14 +407,9 @@ namespace OpenSim.Region.ClientStack | |||
407 | newSimPack.RegionData.SimIP += (uint)byteIP[0]; | 407 | newSimPack.RegionData.SimIP += (uint)byteIP[0]; |
408 | newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port; | 408 | newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port; |
409 | //newSimPack.RegionData.SeedCapability = new byte[0]; | 409 | //newSimPack.RegionData.SeedCapability = new byte[0]; |
410 | 410 | newSimPack.RegionData.SeedCapability = Helpers.StringToField(capsURL); | |
411 | string capsPath = "http://" + externalIPEndPoint.Address.ToString() + ":9000/CAPS/" + m_authenticateSessionsHandler.AgentCircuits[this.CircuitCode].CapsPath +"0000/"; | ||
412 | System.Text.ASCIIEncoding enc=new System.Text.ASCIIEncoding(); | ||
413 | newSimPack.RegionData.SeedCapability = enc.GetBytes(capsPath); | ||
414 | |||
415 | 411 | ||
416 | this.OutPacket(newSimPack); | 412 | this.OutPacket(newSimPack); |
417 | //this.DowngradeClient(); | ||
418 | } | 413 | } |
419 | 414 | ||
420 | public void SendMapBlock(List<MapBlockData> mapBlocks) | 415 | public void SendMapBlock(List<MapBlockData> mapBlocks) |
@@ -450,17 +445,14 @@ namespace OpenSim.Region.ClientStack | |||
450 | OutPacket(tpLocal); | 445 | OutPacket(tpLocal); |
451 | } | 446 | } |
452 | 447 | ||
453 | public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags) | 448 | public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags, string capsURL) |
454 | { | 449 | { |
455 | TeleportFinishPacket teleport = new TeleportFinishPacket(); | 450 | TeleportFinishPacket teleport = new TeleportFinishPacket(); |
456 | teleport.Info.AgentID = this.AgentID; | 451 | teleport.Info.AgentID = this.AgentID; |
457 | teleport.Info.RegionHandle = regionHandle; | 452 | teleport.Info.RegionHandle = regionHandle; |
458 | teleport.Info.SimAccess = simAccess; | 453 | teleport.Info.SimAccess = simAccess; |
459 | 454 | ||
460 | string capsPath = "http://" + newRegionEndPoint.Address.ToString() + ":9000/CAPS/" + m_authenticateSessionsHandler.AgentCircuits[this.CircuitCode].CapsPath + "0000/"; | 455 | teleport.Info.SeedCapability = Helpers.StringToField(capsURL); |
461 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | ||
462 | teleport.Info.SeedCapability = enc.GetBytes(capsPath); | ||
463 | |||
464 | //teleport.Info.SeedCapability = new byte[0]; | 456 | //teleport.Info.SeedCapability = new byte[0]; |
465 | 457 | ||
466 | IPAddress oIP = newRegionEndPoint.Address; | 458 | IPAddress oIP = newRegionEndPoint.Address; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 19fd075..813308b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -75,6 +75,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
75 | 75 | ||
76 | #region Properties | 76 | #region Properties |
77 | 77 | ||
78 | public AgentCircuitManager AuthenticateHandler | ||
79 | { | ||
80 | get { return this.authenticateHandler; } | ||
81 | } | ||
78 | /// <summary> | 82 | /// <summary> |
79 | /// | 83 | /// |
80 | /// </summary> | 84 | /// </summary> |
@@ -600,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
600 | 604 | ||
601 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 605 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
602 | 606 | ||
603 | // client.OnCreateNewInventoryItem += CreateNewInventoryItem; | 607 | //client.OnCreateNewInventoryItem += CreateNewInventoryItem; |
604 | //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; | 608 | //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; |
605 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; | 609 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; |
606 | client.OnRequestTaskInventory += RequestTaskInventory; | 610 | client.OnRequestTaskInventory += RequestTaskInventory; |
@@ -922,7 +926,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
922 | commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); | 926 | commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); |
923 | commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); | 927 | commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); |
924 | 928 | ||
925 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4)); | 929 | //TODO: following line is hard coded to port 9000, really need to change this as soon as possible |
930 | AgentCircuitData circuitdata = remoteClient.RequestClientInfo(); | ||
931 | string capsPath = "http://" + reg.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" + this.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/"; | ||
932 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath); | ||
926 | } | 933 | } |
927 | } | 934 | } |
928 | } | 935 | } |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 17c1b3a..b021b44 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -620,7 +620,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
620 | bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); | 620 | bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); |
621 | if (res) | 621 | if (res) |
622 | { | 622 | { |
623 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint); | 623 | //TODO: following line is hard coded to port 9000, really need to change this as soon as possible |
624 | AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo(); | ||
625 | string capsPath = "http://" + neighbourRegion.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" +this.m_scene.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/"; | ||
626 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath); | ||
624 | this.MakeChildAgent(); | 627 | this.MakeChildAgent(); |
625 | } | 628 | } |
626 | } | 629 | } |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index 367ee67..3e9b669 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -132,10 +132,10 @@ namespace SimpleApp | |||
132 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) { } | 132 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) { } |
133 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint) { } | 133 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint) { } |
134 | public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } | 134 | public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } |
135 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint) { } | 135 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL) { } |
136 | public virtual void SendMapBlock(List<MapBlockData> mapBlocks) { } | 136 | public virtual void SendMapBlock(List<MapBlockData> mapBlocks) { } |
137 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) { } | 137 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) { } |
138 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags) { } | 138 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL) { } |
139 | public virtual void SendTeleportCancel() { } | 139 | public virtual void SendTeleportCancel() { } |
140 | public virtual void SendTeleportLocationStart() { } | 140 | public virtual void SendTeleportLocationStart() { } |
141 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) { } | 141 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) { } |