diff options
author | Justin Clark-Casey (justincc) | 2012-02-24 23:35:47 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-24 23:35:59 +0000 |
commit | dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a (patch) | |
tree | 60020a679a229d078ce3be2f933025c81c677d74 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Amend to last commit: synchronize access to queues. (diff) | |
parent | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:... (diff) | |
download | opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.zip opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.gz opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.bz2 opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.xz |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-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; |