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

* Applying patch from Mantis #607 - Grid Server crash. Thanks Diva.

0.6.0-stable
Adam Frisby 2008-03-11 15:48:50 +00:00
parent f0bfb87979
commit b40957b57c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -239,9 +239,10 @@ namespace OpenSim.Grid.GridServer
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
string myword; string myword;
if (requestData.ContainsKey("UUID")) LLUUID uuid;
if (requestData.ContainsKey("UUID") && LLUUID.TryParse((string)requestData["UUID"], out uuid))
{ {
TheSim = getRegion(new LLUUID((string)requestData["UUID"])); TheSim = getRegion(uuid);
// logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID."); // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID.");
} }
@ -275,14 +276,25 @@ namespace OpenSim.Grid.GridServer
TheSim.regionUserSendKey = config.UserSendKey; TheSim.regionUserSendKey = config.UserSendKey;
TheSim.regionUserRecvKey = config.UserRecvKey; TheSim.regionUserRecvKey = config.UserRecvKey;
TheSim.serverIP = (string)requestData["sim_ip"]; try
TheSim.serverPort = Convert.ToUInt32((string)requestData["sim_port"]); {
TheSim.httpPort = Convert.ToUInt32((string)requestData["http_port"]); TheSim.serverIP = (string)requestData["sim_ip"];
TheSim.remotingPort = Convert.ToUInt32((string)requestData["remoting_port"]); TheSim.serverPort = Convert.ToUInt32((string)requestData["sim_port"]);
TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]); TheSim.httpPort = Convert.ToUInt32((string)requestData["http_port"]);
TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]); TheSim.remotingPort = Convert.ToUInt32((string)requestData["remoting_port"]);
TheSim.regionLocZ = 0; TheSim.regionLocX = Convert.ToUInt32((string)requestData["region_locx"]);
TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]); TheSim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]);
TheSim.regionLocZ = 0;
}
catch (FormatException)
{
m_log.Info("[GRID]: invalid login parameters, ignoring.");
responseData["error"] = "Wrong format in login parameters. Please verify them.";
return response;
}
LLUUID textureID = LLUUID.Zero;
if (LLUUID.TryParse((string)requestData["map-image-id"], out textureID))
TheSim.regionMapTextureID = textureID;
// part of an initial brutish effort to provide accurate information (as per the xml region spec) // part of an initial brutish effort to provide accurate information (as per the xml region spec)
// wrt the ownership of a given region // wrt the ownership of a given region