diff options
| author | BlueWall | 2012-02-17 21:15:18 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-17 21:15:18 -0500 |
| commit | fbccff49940725f325dd864c2c5c39ad4bdb63e1 (patch) | |
| tree | d9f4457a8441ae381dd567a37d1ba9c02e16f809 /OpenSim/Region/Framework/Scenes | |
| parent | Parcel sales support to SQLite (diff) | |
| parent | Fix a bug where changing shape parameters of a child prim in a linkset would ... (diff) | |
| download | opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.zip opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.gz opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.bz2 opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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; |