From 2717ef5da97bc62c241cc9944a0d272374758fd7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 19 May 2017 05:34:49 +0100 Subject: [PATCH 1/4] change some confusing comands help --- .../World/Objects/Commands/ObjectCommandsModule.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index 79c47133be..5a2a173835 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/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 to ", - "Delete scene objects within the given area.", + "delete object pos ", + "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] to ", - "Show details of scene objects within the given area.", + "show object pos [--full] ", + "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 to ", - "Show details of scene object parts within the given area.", + "show part pos ", + "Show details of scene object parts within the given volume.", ConsoleUtil.CoordHelp, HandleShowPartByPos); From 7c9615f0002247fa0f950cd0e4f143eadc789c71 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 19 May 2017 17:35:49 +0100 Subject: [PATCH 2/4] fix land parcel group been lost on region upload --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index b534a2b0a9..74b10ed9be 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/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; From 52dd6833260720ada5681df337bb549725dea6c5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 19 May 2017 18:03:02 +0100 Subject: [PATCH 3/4] fix a null ref on parcels join --- .../World/Land/LandManagementModule.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 057e204d59..a2c7c836b9 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/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) - m_landUUIDList.Remove(land.LandData.GlobalID); - land.Clear(); + if(land != null && land.LandData != null) + { + 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(); + } } /// From 9397b358d36067824b2cd4328398bbce9aecaa63 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 19 May 2017 19:51:23 +0100 Subject: [PATCH 4/4] mantis 8170: let physics know Always_run on adding the avatar --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 805c9adf2f..27312745c5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/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)