diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 8534b56..75755cb 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -42,6 +42,7 @@ using OpenMetaverse.Packets; | |||
42 | using log4net; | 42 | using log4net; |
43 | using Nini.Config; | 43 | using Nini.Config; |
44 | using OpenSim.Framework; | 44 | using OpenSim.Framework; |
45 | using OpenSim.Framework.Communications.Capabilities; | ||
45 | using OpenSim.Framework.Servers; | 46 | using OpenSim.Framework.Servers; |
46 | using OpenSim.Region.Environment.Interfaces; | 47 | using OpenSim.Region.Environment.Interfaces; |
47 | using OpenSim.Region.Environment.Scenes; | 48 | using OpenSim.Region.Environment.Scenes; |
@@ -377,7 +378,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
377 | */ | 378 | */ |
378 | } | 379 | } |
379 | 380 | ||
380 | |||
381 | public OSD RequestRezAvatarMethod(string path, OSD request) | 381 | public OSD RequestRezAvatarMethod(string path, OSD request) |
382 | { | 382 | { |
383 | //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString()); | 383 | //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString()); |
@@ -468,28 +468,28 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
468 | // Generate a dummy agent for the user so we can get back a CAPS path | 468 | // Generate a dummy agent for the user so we can get back a CAPS path |
469 | AgentCircuitData agentData = new AgentCircuitData(); | 469 | AgentCircuitData agentData = new AgentCircuitData(); |
470 | agentData.AgentID = LocalAgentID; | 470 | agentData.AgentID = LocalAgentID; |
471 | agentData.BaseFolder=UUID.Zero; | 471 | agentData.BaseFolder = UUID.Zero; |
472 | agentData.CapsPath=Util.GetRandomCapsPath(); | 472 | agentData.CapsPath = CapsUtil.GetRandomCapsPath(); |
473 | agentData.child = false; | 473 | agentData.child = false; |
474 | agentData.circuitcode = (uint)(Util.RandomClass.Next()); | 474 | agentData.circuitcode = (uint)(Util.RandomClass.Next()); |
475 | agentData.firstname = FirstName; | 475 | agentData.firstname = FirstName; |
476 | agentData.lastname = LastName; | 476 | agentData.lastname = LastName; |
477 | agentData.SecureSessionID=UUID.Random(); | 477 | agentData.SecureSessionID = UUID.Random(); |
478 | agentData.SessionID=UUID.Random(); | 478 | agentData.SessionID = UUID.Random(); |
479 | agentData.startpos = new Vector3(128f, 128f, 100f); | 479 | agentData.startpos = new Vector3(128f, 128f, 100f); |
480 | 480 | ||
481 | // Pre-Fill our region cache with information on the agent. | 481 | // Pre-Fill our region cache with information on the agent. |
482 | UserAgentData useragent = new UserAgentData(); | 482 | UserAgentData useragent = new UserAgentData(); |
483 | useragent.AgentIP="unknown"; | 483 | useragent.AgentIP = "unknown"; |
484 | useragent.AgentOnline=true; | 484 | useragent.AgentOnline = true; |
485 | useragent.AgentPort = (uint)0; | 485 | useragent.AgentPort = (uint)0; |
486 | useragent.Handle = regionhandle; | 486 | useragent.Handle = regionhandle; |
487 | useragent.InitialRegion = reg.originRegionID; | 487 | useragent.InitialRegion = reg.originRegionID; |
488 | useragent.LoginTime=Util.UnixTimeSinceEpoch(); | 488 | useragent.LoginTime = Util.UnixTimeSinceEpoch(); |
489 | useragent.LogoutTime = 0; | 489 | useragent.LogoutTime = 0; |
490 | useragent.Position=agentData.startpos; | 490 | useragent.Position = agentData.startpos; |
491 | useragent.Region=reg.originRegionID; | 491 | useragent.Region = reg.originRegionID; |
492 | useragent.SecureSessionID=agentData.SecureSessionID; | 492 | useragent.SecureSessionID = agentData.SecureSessionID; |
493 | useragent.SessionID = agentData.SessionID; | 493 | useragent.SessionID = agentData.SessionID; |
494 | 494 | ||
495 | UserProfileData userProfile = new UserProfileData(); | 495 | UserProfileData userProfile = new UserProfileData(); |
@@ -565,7 +565,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
565 | string httpaddr = reg.ExternalHostName; | 565 | string httpaddr = reg.ExternalHostName; |
566 | string urlport = reg.HttpPort.ToString(); | 566 | string urlport = reg.HttpPort.ToString(); |
567 | 567 | ||
568 | |||
569 | if (httpSSL) | 568 | if (httpSSL) |
570 | { | 569 | { |
571 | rezHttpProtocol = "https://"; | 570 | rezHttpProtocol = "https://"; |
@@ -576,8 +575,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
576 | httpaddr = httpsCN; | 575 | httpaddr = httpsCN; |
577 | } | 576 | } |
578 | 577 | ||
579 | |||
580 | |||
581 | // DEPRECIATED | 578 | // DEPRECIATED |
582 | responseMap["seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); | 579 | responseMap["seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); |
583 | 580 | ||