Merge branch 'master' into httptests

4 files changed, 24 insertions, 26 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index eabeaf1..72fff22 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -701,6 +701,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         last = parts[1];
                     }
                     uui = userID + ";" + homeURL + ";" + first + " " + last;
+                    return result;
                 }
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e77f0aa..e65f860 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -768,7 +768,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     else
                         so = m_scene.GetSceneObjectGroup(localId);
 
-                    if (!so.IsAttachment)
+                    if (so!= null && !so.IsAttachment)
                        deletes.Add(so);
 
         //                if (deletes.Count == 0)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index fcc3463..06d767d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -537,39 +537,29 @@ namespace OpenSim.Region.Framework.Scenes
             }
             set
             {
+                CreatorData = string.Empty;
                 if ((value == null) || (value != null && value == string.Empty))
-                {
-                    CreatorData = string.Empty;
                     return;
-                }
 
-                if (!value.Contains(";")) // plain UUID
+                // value is uuid  or uuid;homeuri;firstname lastname
+                string[] parts = value.Split(';');
+                if (parts.Length > 0)
                 {
+
                     UUID uuid = UUID.Zero;
-                    UUID.TryParse(value, out uuid);
+                    UUID.TryParse(parts[0], out uuid);
                     CreatorID = uuid;
-                }
-                else // <uuid>[;<endpoint>[;name]]
-                {
-                    string name = "Unknown User";
-                    string[] parts = value.Split(';');
-                    if (parts.Length >= 1)
-                    {
-                        UUID uuid = UUID.Zero;
-                        UUID.TryParse(parts[0], out uuid);
-                        CreatorID = uuid;
-                    }
-                    if (parts.Length >= 2)
+
+                    if (parts.Length > 1)
                     {
                         CreatorData = parts[1];
                         if (!CreatorData.EndsWith("/"))
                             CreatorData += "/";
+                        if (parts.Length > 2)
+                            CreatorData += ';' + parts[2];
+                        else
+                            CreatorData += ";Unknown User";
                     }
-                    if (parts.Length >= 3)
-                        name = parts[2];
-
-                    CreatorData += ';' + name;
-                    
                 }
             }
         }
@@ -4653,6 +4643,12 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
 
                         DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
 
+                        if(UsePhysics && !SetPhantom &&  m_localId == ParentGroup.RootPart.LocalId &&
+                            m_vehicleParams != null && m_vehicleParams.CameraDecoupled)
+                        AddFlag(PrimFlags.CameraDecoupled);
+                        else
+                            RemFlag(PrimFlags.CameraDecoupled);
+
                         if (pa.Building != building)
                             pa.Building = building;
                     }
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 6c6ccf9..ceb2146 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -278,10 +278,12 @@ namespace OpenSim.Services.Connectors
 
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
+            GridRegion rinfo = null;
             ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
 
-            if (m_regionCache.Contains(regionHandle))
-                return (GridRegion)m_regionCache[regionHandle];
+            // this cache includes NULL regions
+            if (m_regionCache.TryGetValue(regionHandle, out rinfo))
+                return rinfo;
 
             Dictionary<string, object> sendData = new Dictionary<string, object>();
 
@@ -304,7 +306,6 @@ namespace OpenSim.Services.Connectors
                 return null;
             }
 
-            GridRegion rinfo = null;
             if (reply != string.Empty)
             {
                 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);