aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs27
1 files changed, 25 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index ce3c62f..c0ef208 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -121,8 +121,17 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
121 } 121 }
122 catch (NotImplementedException) 122 catch (NotImplementedException)
123 { 123 {
124 m_log.Error("[OGP]: Certificate validation handler change not supported. You may get ssl certificate validation errors teleporting from your region to some SSL regions."); 124 try
125 {
126 // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet! Don't remove this!
127 ServicePointManager.CertificatePolicy = new MonoCert();
128 }
129 catch (Exception)
130 {
131 m_log.Error("[OGP]: Certificate validation handler change not supported. You may get ssl certificate validation errors teleporting from your region to some SSL regions.");
132 }
125 } 133 }
134
126 } 135 }
127 136
128 if (!m_scene.Contains(scene)) 137 if (!m_scene.Contains(scene))
@@ -268,7 +277,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
268 agentData.lastname = LastName; 277 agentData.lastname = LastName;
269 agentData.SecureSessionID=LLUUID.Random(); 278 agentData.SecureSessionID=LLUUID.Random();
270 agentData.SessionID=LLUUID.Random(); 279 agentData.SessionID=LLUUID.Random();
271 agentData.startpos=LLVector3.Zero; 280 agentData.startpos = new LLVector3(128f, 128f, 100f);
272 281
273 // Pre-Fill our region cache with information on the agent. 282 // Pre-Fill our region cache with information on the agent.
274 UserAgentData useragent = new UserAgentData(); 283 UserAgentData useragent = new UserAgentData();
@@ -556,6 +565,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
556 string rrAccess = rezResponseMap["sim_access"].AsString(); 565 string rrAccess = rezResponseMap["sim_access"].AsString();
557 566
558 LLSDArray RezResponsePositionArray = (LLSDArray)rezResponseMap["position"]; 567 LLSDArray RezResponsePositionArray = (LLSDArray)rezResponseMap["position"];
568
559 569
560 responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap); 570 responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap);
561 responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString()); 571 responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString());
@@ -876,4 +886,17 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
876 } 886 }
877 887
878 } 888 }
889 public class MonoCert : ICertificatePolicy
890 {
891
892
893 #region ICertificatePolicy Members
894
895 public bool CheckValidationResult(ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem)
896 {
897 return true;
898 }
899
900 #endregion
901 }
879} 902}