diff options
author | UbitUmarov | 2012-03-13 17:56:32 +0000 |
---|---|---|
committer | UbitUmarov | 2012-03-13 17:56:32 +0000 |
commit | 3de3b9e63c07bc4b8e6c76d60167f9ead8a07f49 (patch) | |
tree | be55044dfc587d484586fd80ff6e5a4bd2283244 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Refactor, move OjectChangeData into it's own file and rename (diff) | |
download | opensim-SC_OLD-3de3b9e63c07bc4b8e6c76d60167f9ead8a07f49.zip opensim-SC_OLD-3de3b9e63c07bc4b8e6c76d60167f9ead8a07f49.tar.gz opensim-SC_OLD-3de3b9e63c07bc4b8e6c76d60167f9ead8a07f49.tar.bz2 opensim-SC_OLD-3de3b9e63c07bc4b8e6c76d60167f9ead8a07f49.tar.xz |
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index e6e3ad0..7b77ea0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1536,7 +1536,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1536 | /// <param name="SetPhantom"></param> | 1536 | /// <param name="SetPhantom"></param> |
1537 | /// <param name="remoteClient"></param> | 1537 | /// <param name="remoteClient"></param> |
1538 | protected internal void UpdatePrimFlags( | 1538 | protected internal void UpdatePrimFlags( |
1539 | uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, IClientAPI remoteClient) | 1539 | uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, ExtraPhysicsData PhysData, IClientAPI remoteClient) |
1540 | { | 1540 | { |
1541 | SceneObjectGroup group = GetGroupByPrim(localID); | 1541 | SceneObjectGroup group = GetGroupByPrim(localID); |
1542 | if (group != null) | 1542 | if (group != null) |
@@ -1544,7 +1544,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1544 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) | 1544 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) |
1545 | { | 1545 | { |
1546 | // VolumeDetect can't be set via UI and will always be off when a change is made there | 1546 | // VolumeDetect can't be set via UI and will always be off when a change is made there |
1547 | group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false); | 1547 | if (PhysData.PhysShapeType == PhysShapeType.invalid) |
1548 | group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false); | ||
1549 | else | ||
1550 | { | ||
1551 | SceneObjectPart part = GetSceneObjectPart(localID); | ||
1552 | if (part != null) | ||
1553 | part.UpdateExtraPhysics(PhysData); | ||
1554 | } | ||
1548 | } | 1555 | } |
1549 | } | 1556 | } |
1550 | } | 1557 | } |