OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Remove a message handler 

* Add a more specific error handler for when we're unable to pull the OGP state
* rez_avatar/derez ?
0.6.0-stable
Teravus Ovares 2008-09-25 02:39:53 +00:00
parent 7117f8b680
commit 031eb08b8e
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -617,6 +617,8 @@ namespace OpenSim.Framework.Servers
reader.Close(); reader.Close();
requestStream.Close(); requestStream.Close();
//m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
LLSD llsdRequest = null; LLSD llsdRequest = null;
LLSD llsdResponse = null; LLSD llsdResponse = null;

20
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -268,6 +268,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
return RequestRezAvatarMethod(path, request); return RequestRezAvatarMethod(path, request);
case "rez_avatar/place": case "rez_avatar/place":
return RequestRezAvatarMethod(path, request); return RequestRezAvatarMethod(path, request);
case "rez_avatar/derez":
return DerezAvatarMethod(path, request);
//break; //break;
default: default:
return GenerateNoHandlerMessage(); return GenerateNoHandlerMessage();
@ -365,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
public LLSD RequestRezAvatarMethod(string path, LLSD request) public LLSD RequestRezAvatarMethod(string path, LLSD request)
{ {
m_log.WarnFormat("[REQUESTREZAVATAR]: {0}", request.ToString()); //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString());
LLSDMap requestMap = (LLSDMap)request; LLSDMap requestMap = (LLSDMap)request;
@ -564,6 +566,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
{ {
if (CapsLoginID.ContainsKey(rezAvatarPath)) 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! // 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!"); 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); CapsLoginID.Add(rezAvatarPath, agentData);
} }
} }
//System.Console.WriteLine("Response:" + responseMap.ToString());
return responseMap; return responseMap;
} }
@ -852,7 +856,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
} }
else else
{ {
return GenerateNoHandlerMessage(); return GenerateNoStateMessage(LocalID);
} }
} }
else else
@ -992,7 +996,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
map["connect"] = LLSD.FromString("false"); map["connect"] = LLSD.FromString("false");
return map; 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) private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata)
{ {
userdata = null; userdata = null;