* Remove a message handler

* Add a more specific error handler for when we're unable to pull the OGP state
* rez_avatar/derez ?

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
             reader.Close();
             requestStream.Close();
 
+            //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
+
             LLSD llsdRequest = null;
             LLSD llsdResponse = null;
             
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
                     return RequestRezAvatarMethod(path, request);
                 case "rez_avatar/place":
                     return RequestRezAvatarMethod(path, request);
+                case "rez_avatar/derez":
+                    return DerezAvatarMethod(path, request);
                     //break;
                 default:
                     return GenerateNoHandlerMessage();
@@ -365,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
 
         public LLSD RequestRezAvatarMethod(string path, LLSD request)
         {
-            m_log.WarnFormat("[REQUESTREZAVATAR]: {0}", request.ToString());
+            //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString());
 
             LLSDMap requestMap = (LLSDMap)request;
 
@@ -564,6 +566,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
             {
                 if (CapsLoginID.ContainsKey(rezAvatarPath))
                 {
+                    CapsLoginID[rezAvatarPath] = agentData;
+                    
                     // 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!
                     m_log.Error("[OGP]: Holy anomoly batman! Caps path already existed!  All the UUID Duplication worries were founded!");
                 }
@@ -572,7 +576,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
                     CapsLoginID.Add(rezAvatarPath, agentData);
                 }
             }
-
+            //System.Console.WriteLine("Response:" + responseMap.ToString());
             return responseMap;
         }
 
@@ -852,7 +856,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
                 }
                 else
                 {
-                    return GenerateNoHandlerMessage();
+                    return GenerateNoStateMessage(LocalID);
                 }
             }
             else
@@ -992,7 +996,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
             map["connect"] = LLSD.FromString("false");
             return map;
         }
-
+        public LLSD GenerateNoStateMessage(UUID passedAvatar)
+        {
+            LLSDMap map = new LLSDMap();
+            map["reason"] = LLSD.FromString("derez failed");
+            map["message"] = LLSD.FromString("Unable to locate OGP state for avatar " + passedAvatar.ToString());
+            map["login"] = LLSD.FromString("false");
+            map["connect"] = LLSD.FromString("false");
+            return map;
+        }
         private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata)
         {
             userdata = null;