Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

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
                 HttpWebResponse response = MultipartForm.Post(request, postParameters);
                 using (Stream responseStream = response.GetResponseStream())
                 {
+                    string responseStr = null;
+
                     try
                     {
-                        string responseStr = responseStream.GetStreamString();
+                        responseStr = responseStream.GetStreamString();
                         OSD responseOSD = OSDParser.Deserialize(responseStr);
                         if (responseOSD.Type == OSDType.Map)
                         {
@@ -317,12 +319,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         }
                         else
                         {
-                            errorMessage = "Response format was invalid.";
+                            errorMessage = "Response format was invalid:\n" + responseStr;
                         }
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        errorMessage = "Failed to parse the response.";
+                        if (!String.IsNullOrEmpty(responseStr))
+                            errorMessage = "Failed to parse the response:\n" + responseStr;
+                        else
+                            errorMessage = "Failed to retrieve the response: " + ex.Message;
                     }
                 }
             }
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
                 }
                 else
                 {
-                    position = new Vector3(float.Parse(uriMatch.Groups["x"].Value),
-                                           float.Parse(uriMatch.Groups["y"].Value),
-                                           float.Parse(uriMatch.Groups["z"].Value));
+                    position = new Vector3(float.Parse(uriMatch.Groups["x"].Value, Culture.NumberFormatInfo),
+                                           float.Parse(uriMatch.Groups["y"].Value, Culture.NumberFormatInfo),
+                                           float.Parse(uriMatch.Groups["z"].Value, Culture.NumberFormatInfo));
 
                     string regionName = uriMatch.Groups["region"].ToString();
                     if (regionName != null)