OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2017-05-20 14:30:49 +01:00
parent 40091f9be5 9397b358d3
commit 78c4f8000e
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -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();
}
}
/// <summary>

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

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

12
OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
View File

@ -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 scene objects within the given area.",
"delete object pos <start x, start y , start z> <end x, end y, end z>",
"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 details of scene objects within the given area.",
"show object pos [--full] <start x, start y , start z> <end x, end y, end z>",
"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 details of scene object parts within the given area.",
"show part pos <start x, start y , start z> <end x, end y, end z>",
"Show details of scene object parts within the given volume.",
ConsoleUtil.CoordHelp,
HandleShowPartByPos);

1
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -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)