diff options
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 13 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 79e49a1..3fdee9c 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -303,9 +303,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
303 | HttpWebResponse response = MultipartForm.Post(request, postParameters); | 303 | HttpWebResponse response = MultipartForm.Post(request, postParameters); |
304 | using (Stream responseStream = response.GetResponseStream()) | 304 | using (Stream responseStream = response.GetResponseStream()) |
305 | { | 305 | { |
306 | string responseStr = null; | ||
307 | |||
306 | try | 308 | try |
307 | { | 309 | { |
308 | string responseStr = responseStream.GetStreamString(); | 310 | responseStr = responseStream.GetStreamString(); |
309 | OSD responseOSD = OSDParser.Deserialize(responseStr); | 311 | OSD responseOSD = OSDParser.Deserialize(responseStr); |
310 | if (responseOSD.Type == OSDType.Map) | 312 | if (responseOSD.Type == OSDType.Map) |
311 | { | 313 | { |
@@ -317,12 +319,15 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
317 | } | 319 | } |
318 | else | 320 | else |
319 | { | 321 | { |
320 | errorMessage = "Response format was invalid."; | 322 | errorMessage = "Response format was invalid:\n" + responseStr; |
321 | } | 323 | } |
322 | } | 324 | } |
323 | catch | 325 | catch (Exception ex) |
324 | { | 326 | { |
325 | errorMessage = "Failed to parse the response."; | 327 | if (!String.IsNullOrEmpty(responseStr)) |
328 | errorMessage = "Failed to parse the response:\n" + responseStr; | ||
329 | else | ||
330 | errorMessage = "Failed to retrieve the response: " + ex.Message; | ||
326 | } | 331 | } |
327 | } | 332 | } |
328 | } | 333 | } |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 7b25274..c333b5c 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -405,9 +405,9 @@ namespace OpenSim.Services.LLLoginService | |||
405 | } | 405 | } |
406 | else | 406 | else |
407 | { | 407 | { |
408 | position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), | 408 | position = new Vector3(float.Parse(uriMatch.Groups["x"].Value, Culture.NumberFormatInfo), |
409 | float.Parse(uriMatch.Groups["y"].Value), | 409 | float.Parse(uriMatch.Groups["y"].Value, Culture.NumberFormatInfo), |
410 | float.Parse(uriMatch.Groups["z"].Value)); | 410 | float.Parse(uriMatch.Groups["z"].Value, Culture.NumberFormatInfo)); |
411 | 411 | ||
412 | string regionName = uriMatch.Groups["region"].ToString(); | 412 | string regionName = uriMatch.Groups["region"].ToString(); |
413 | if (regionName != null) | 413 | if (regionName != null) |