aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/InterGrid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/InterGrid')
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 0c15637..90b7bcf 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -123,8 +123,10 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
123 { 123 {
124 try 124 try
125 { 125 {
126#pragma warning disable 0612
126 // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet! Don't remove this! 127 // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet! Don't remove this!
127 ServicePointManager.CertificatePolicy = new MonoCert(); 128 ServicePointManager.CertificatePolicy = new MonoCert();
129#pragma warning restore 0612
128 } 130 }
129 catch (Exception) 131 catch (Exception)
130 { 132 {
@@ -389,7 +391,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
389 Parameter = (LLSDArray)((LLSD)requestMap["parameter"]); 391 Parameter = (LLSDArray)((LLSD)requestMap["parameter"]);
390 } 392 }
391 393
392 int version = 1; 394 //int version = 1;
393 int estateID = 1; 395 int estateID = 1;
394 int parentEstateID = 1; 396 int parentEstateID = 1;
395 LLUUID regionID = LLUUID.Zero; 397 LLUUID regionID = LLUUID.Zero;
@@ -398,10 +400,10 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
398 for (int i = 0; i < Parameter.Count; i++) 400 for (int i = 0; i < Parameter.Count; i++)
399 { 401 {
400 LLSDMap item = (LLSDMap)Parameter[i]; 402 LLSDMap item = (LLSDMap)Parameter[i];
401 if (item.ContainsKey("version")) 403// if (item.ContainsKey("version"))
402 { 404// {
403 version = item["version"].AsInteger(); 405// version = item["version"].AsInteger();
404 } 406// }
405 if (item.ContainsKey("estate_id")) 407 if (item.ContainsKey("estate_id"))
406 { 408 {
407 estateID = item["estate_id"].AsInteger(); 409 estateID = item["estate_id"].AsInteger();