diff options
| author | Justin Clark-Casey (justincc) | 2012-02-18 01:15:43 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-18 01:15:43 +0000 |
| commit | 84184708de7f5663cabb3cf652c4f9922a14bf40 (patch) | |
| tree | 7841c8dc4391c1dff34a2bae706002ab2e86d862 /OpenSim/Region | |
| parent | On Windows automatically load the correct native ODE library depending on whe... (diff) | |
| download | opensim-SC_OLD-84184708de7f5663cabb3cf652c4f9922a14bf40.zip opensim-SC_OLD-84184708de7f5663cabb3cf652c4f9922a14bf40.tar.gz opensim-SC_OLD-84184708de7f5663cabb3cf652c4f9922a14bf40.tar.bz2 opensim-SC_OLD-84184708de7f5663cabb3cf652c4f9922a14bf40.tar.xz | |
Fix a bug where changing shape parameters of a child prim in a linkset would not persist.
Resolves http://opensimulator.org/mantis/view.php?id=5819
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index e66678a..66fb493 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -1592,7 +1592,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1592 | 1592 | ||
| 1593 | if (group != null) | 1593 | if (group != null) |
| 1594 | { | 1594 | { |
| 1595 | if (m_parentScene.Permissions.CanEditObject(group.UUID,agentID)) | 1595 | if (m_parentScene.Permissions.CanEditObject(group.UUID, agentID)) |
| 1596 | { | 1596 | { |
| 1597 | group.UpdateExtraParam(primLocalID, type, inUse, data); | 1597 | group.UpdateExtraParam(primLocalID, type, inUse, data); |
| 1598 | } | 1598 | } |
| @@ -1609,7 +1609,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1609 | SceneObjectGroup group = GetGroupByPrim(primLocalID); | 1609 | SceneObjectGroup group = GetGroupByPrim(primLocalID); |
| 1610 | if (group != null) | 1610 | if (group != null) |
| 1611 | { | 1611 | { |
| 1612 | if (m_parentScene.Permissions.CanEditObject(group.GetPartsFullID(primLocalID), agentID)) | 1612 | if (m_parentScene.Permissions.CanEditObject(group.UUID, agentID)) |
| 1613 | { | 1613 | { |
| 1614 | ObjectShapePacket.ObjectDataBlock shapeData = new ObjectShapePacket.ObjectDataBlock(); | 1614 | ObjectShapePacket.ObjectDataBlock shapeData = new ObjectShapePacket.ObjectDataBlock(); |
| 1615 | shapeData.ObjectLocalID = shapeBlock.ObjectLocalID; | 1615 | shapeData.ObjectLocalID = shapeBlock.ObjectLocalID; |