diff options
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 824a39e..816c9fd 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -217,7 +217,6 @@ namespace OpenSim.Grid.GridServer | |||
217 | /// <returns>Startup parameters</returns> | 217 | /// <returns>Startup parameters</returns> |
218 | public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request) | 218 | public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request) |
219 | { | 219 | { |
220 | Console.WriteLine("XMLRPC SIMULATOR LOGIN METHOD CALLED"); | ||
221 | 220 | ||
222 | XmlRpcResponse response = new XmlRpcResponse(); | 221 | XmlRpcResponse response = new XmlRpcResponse(); |
223 | Hashtable responseData = new Hashtable(); | 222 | Hashtable responseData = new Hashtable(); |
@@ -229,7 +228,6 @@ namespace OpenSim.Grid.GridServer | |||
229 | Console.WriteLine(requestData.ToString()); | 228 | Console.WriteLine(requestData.ToString()); |
230 | if (requestData.ContainsKey("UUID")) | 229 | if (requestData.ContainsKey("UUID")) |
231 | { | 230 | { |
232 | Console.WriteLine("...VIA UUID"); | ||
233 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); | 231 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); |
234 | logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); | 232 | logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); |
235 | } | 233 | } |
@@ -248,7 +246,6 @@ namespace OpenSim.Grid.GridServer | |||
248 | if (TheSim == null) | 246 | if (TheSim == null) |
249 | { | 247 | { |
250 | //NEW REGION | 248 | //NEW REGION |
251 | Console.WriteLine("THIS IS A NEW REGION...ADDING"); | ||
252 | TheSim = new SimProfileData(); | 249 | TheSim = new SimProfileData(); |
253 | 250 | ||
254 | TheSim.regionRecvKey = config.SimRecvKey; | 251 | TheSim.regionRecvKey = config.SimRecvKey; |
@@ -277,7 +274,23 @@ namespace OpenSim.Grid.GridServer | |||
277 | { | 274 | { |
278 | try | 275 | try |
279 | { | 276 | { |
280 | Console.WriteLine("ADDED");kvp.Value.AddProfile(TheSim); | 277 | DataResponse insertResponse = kvp.Value.AddProfile(TheSim); |
278 | switch(insertResponse) | ||
279 | { | ||
280 | case DataResponse.RESPONSE_OK: | ||
281 | Console.WriteLine("New sim creation successful: " + TheSim.regionName); | ||
282 | break; | ||
283 | case DataResponse.RESPONSE_ERROR: | ||
284 | Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName); | ||
285 | break; | ||
286 | case DataResponse.RESPONSE_INVALIDCREDENTIALS: | ||
287 | Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName); | ||
288 | break; | ||
289 | case DataResponse.RESPONSE_AUTHREQUIRED: | ||
290 | Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName); | ||
291 | break; | ||
292 | } | ||
293 | |||
281 | } | 294 | } |
282 | catch (Exception) | 295 | catch (Exception) |
283 | { | 296 | { |