aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2007-08-09 12:59:42 +0000
committerMW2007-08-09 12:59:42 +0000
commita56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch)
treee19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim/Region/ClientStack
parentTransition between not flying / flying should be smoother (diff)
downloadopensim-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 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs18
1 files changed, 5 insertions, 13 deletions
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;