aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-25 02:39:53 +0000
committerTeravus Ovares2008-09-25 02:39:53 +0000
commit031eb08b8eac4768c51b3c2d6b3464d8ac103cdd (patch)
tree1016ed7dea3e1584747351a2544fe3f902b49604
parentremoval of more dead alter table code (diff)
downloadopensim-SC_OLD-031eb08b8eac4768c51b3c2d6b3464d8ac103cdd.zip
opensim-SC_OLD-031eb08b8eac4768c51b3c2d6b3464d8ac103cdd.tar.gz
opensim-SC_OLD-031eb08b8eac4768c51b3c2d6b3464d8ac103cdd.tar.bz2
opensim-SC_OLD-031eb08b8eac4768c51b3c2d6b3464d8ac103cdd.tar.xz
* Remove a message handler
* Add a more specific error handler for when we're unable to pull the OGP state * rez_avatar/derez ?
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs20
2 files changed, 18 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index a0e71a4..ae07895 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -617,6 +617,8 @@ namespace OpenSim.Framework.Servers
617 reader.Close(); 617 reader.Close();
618 requestStream.Close(); 618 requestStream.Close();
619 619
620 //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
621
620 LLSD llsdRequest = null; 622 LLSD llsdRequest = null;
621 LLSD llsdResponse = null; 623 LLSD llsdResponse = null;
622 624
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 41aec8f..478fbb7 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -268,6 +268,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
268 return RequestRezAvatarMethod(path, request); 268 return RequestRezAvatarMethod(path, request);
269 case "rez_avatar/place": 269 case "rez_avatar/place":
270 return RequestRezAvatarMethod(path, request); 270 return RequestRezAvatarMethod(path, request);
271 case "rez_avatar/derez":
272 return DerezAvatarMethod(path, request);
271 //break; 273 //break;
272 default: 274 default:
273 return GenerateNoHandlerMessage(); 275 return GenerateNoHandlerMessage();
@@ -365,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
365 367
366 public LLSD RequestRezAvatarMethod(string path, LLSD request) 368 public LLSD RequestRezAvatarMethod(string path, LLSD request)
367 { 369 {
368 m_log.WarnFormat("[REQUESTREZAVATAR]: {0}", request.ToString()); 370 //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString());
369 371
370 LLSDMap requestMap = (LLSDMap)request; 372 LLSDMap requestMap = (LLSDMap)request;
371 373
@@ -564,6 +566,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
564 { 566 {
565 if (CapsLoginID.ContainsKey(rezAvatarPath)) 567 if (CapsLoginID.ContainsKey(rezAvatarPath))
566 { 568 {
569 CapsLoginID[rezAvatarPath] = agentData;
570
567 // This is a joke, if you didn't notice... It's so unlikely to happen, that I'll print this message if it does occur! 571 // This is a joke, if you didn't notice... It's so unlikely to happen, that I'll print this message if it does occur!
568 m_log.Error("[OGP]: Holy anomoly batman! Caps path already existed! All the UUID Duplication worries were founded!"); 572 m_log.Error("[OGP]: Holy anomoly batman! Caps path already existed! All the UUID Duplication worries were founded!");
569 } 573 }
@@ -572,7 +576,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
572 CapsLoginID.Add(rezAvatarPath, agentData); 576 CapsLoginID.Add(rezAvatarPath, agentData);
573 } 577 }
574 } 578 }
575 579 //System.Console.WriteLine("Response:" + responseMap.ToString());
576 return responseMap; 580 return responseMap;
577 } 581 }
578 582
@@ -852,7 +856,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
852 } 856 }
853 else 857 else
854 { 858 {
855 return GenerateNoHandlerMessage(); 859 return GenerateNoStateMessage(LocalID);
856 } 860 }
857 } 861 }
858 else 862 else
@@ -992,7 +996,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
992 map["connect"] = LLSD.FromString("false"); 996 map["connect"] = LLSD.FromString("false");
993 return map; 997 return map;
994 } 998 }
995 999 public LLSD GenerateNoStateMessage(UUID passedAvatar)
1000 {
1001 LLSDMap map = new LLSDMap();
1002 map["reason"] = LLSD.FromString("derez failed");
1003 map["message"] = LLSD.FromString("Unable to locate OGP state for avatar " + passedAvatar.ToString());
1004 map["login"] = LLSD.FromString("false");
1005 map["connect"] = LLSD.FromString("false");
1006 return map;
1007 }
996 private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata) 1008 private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata)
997 { 1009 {
998 userdata = null; 1010 userdata = null;