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

OpenSim/Data/Migration.cs

@@ -146,6 +146,8 @@ namespace OpenSim.Data
                 {
                     m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
                     m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
+                    cmd.CommandText = "ROLLBACK;";
+                    cmd.ExecuteNonQuery();
                 }
 
                 if (version == 0)

OpenSim/Framework/WebUtil.cs

@@ -146,18 +146,23 @@ namespace OpenSim.Framework
                 {
                     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)
                                 return (OSDMap)responseOSD;
                             else
                                 errorMessage = "Response format was invalid.";
                         }
-                        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;
                         }
                     }
                 }

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

@@ -302,6 +302,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             float dz;
 
             Quaternion q = SensePoint.RotationOffset;
+            if (SensePoint.ParentGroup.RootPart.IsAttachment)
+            {
+                // In attachments, the sensor cone always orients with the
+                // avatar rotation. This may include a nonzero elevation if
+                // in mouselook.
+
+                ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
+                q = avatar.Rotation;
+            }
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
             LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
             double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);

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;
                     }
                 }
             }

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)

prebuild.xml

@@ -1299,7 +1299,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server" path="OpenSim/Server" type="Exe">
+    <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>