Merge branch 'master' into httptests

OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs

@@ -679,6 +679,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void removeLandObject(int local_id)
         {
             ILandObject land;
+            UUID landGlobalID = UUID.Zero;
             lock (m_landList)
             {
                 for (int x = 0; x < m_landIDList.GetLength(0); x++)
@@ -697,12 +698,18 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 land = m_landList[local_id];
                 m_landList.Remove(local_id);
-                if(land.LandData != null)
+                if(land != null && land.LandData != null)
-                    m_landUUIDList.Remove(land.LandData.GlobalID);
+                {
-                land.Clear();
+                    landGlobalID = land.LandData.GlobalID;
+                    m_landUUIDList.Remove(landGlobalID);
+                }
             }
 
-            m_scene.EventManager.TriggerLandObjectRemoved(land.LandData.GlobalID);
+            if(landGlobalID != UUID.Zero)
+            {
+                m_scene.EventManager.TriggerLandObjectRemoved(landGlobalID);
+                land.Clear();
+            }
         }
 
         /// <summary>

OpenSim/Region/CoreModules/World/Land/LandObject.cs

@@ -292,8 +292,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             LandData.OwnerID = owner_id;
             if (is_group_owned)
                 LandData.GroupID = owner_id;
-            else
-                LandData.GroupID = UUID.Zero;
             
             LandData.IsGroupOwned = is_group_owned;
 

OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs

@@ -123,8 +123,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "delete object pos",
-                "delete object pos <start-coord> to <end-coord>",
+                "delete object pos <start x, start y , start z> <end x, end y, end z>",
-                "Delete scene objects within the given area.",
+                "Delete scene objects within the given volume.",
                 ConsoleUtil.CoordHelp,
                 HandleDeleteObject);
 
@@ -162,8 +162,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "show object pos",
-                "show object pos [--full] <start-coord> to <end-coord>",
+                "show object pos [--full] <start x, start y , start z> <end x, end y, end z>",
-                "Show details of scene objects within the given area.",
+                "Show details of scene objects within give volume",
                 "The --full option will print out information on all the parts of the object.\n"
                     + "For yet more detailed part information, use the \"show part\" commands.\n"
                     + ConsoleUtil.CoordHelp,
@@ -189,8 +189,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "show part pos",
-                "show part pos <start-coord> to <end-coord>",
+                "show part pos <start x, start y , start z> <end x, end y, end z>",
-                "Show details of scene object parts within the given area.",
+                "Show details of scene object parts within the given volume.",
                 ConsoleUtil.CoordHelp,
                 HandleShowPartByPos);
 

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -4880,6 +4880,7 @@ namespace OpenSim.Region.Framework.Scenes
             PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
             PhysicsActor.SubscribeEvents(100);
             PhysicsActor.LocalID = LocalId;
+            PhysicsActor.SetAlwaysRun = m_setAlwaysRun;
         }
 
         private void OutOfBoundsCall(Vector3 pos)