diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 6dd42dd..5a7f124 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -406,7 +406,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
406 | m_log.ErrorFormat( | 406 | m_log.ErrorFormat( |
407 | "[SCENEGRAPH]: Tried to add scene object {0} to {1} with illegal UUID of {2}", | 407 | "[SCENEGRAPH]: Tried to add scene object {0} to {1} with illegal UUID of {2}", |
408 | sceneObject.Name, m_parentScene.RegionInfo.RegionName, UUID.Zero); | 408 | sceneObject.Name, m_parentScene.RegionInfo.RegionName, UUID.Zero); |
409 | 409 | ||
410 | return false; | 410 | return false; |
411 | } | 411 | } |
412 | 412 | ||
@@ -415,12 +415,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
415 | // m_log.DebugFormat( | 415 | // m_log.DebugFormat( |
416 | // "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()", | 416 | // "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()", |
417 | // m_parentScene.RegionInfo.RegionName, sceneObject.UUID); | 417 | // m_parentScene.RegionInfo.RegionName, sceneObject.UUID); |
418 | 418 | ||
419 | return false; | 419 | return false; |
420 | } | 420 | } |
421 | 421 | ||
422 | // m_log.DebugFormat( | 422 | // m_log.DebugFormat( |
423 | // "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}", | 423 | // "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}", |
424 | // sceneObject.Name, sceneObject.UUID, sceneObject.Parts.Length, m_parentScene.RegionInfo.RegionName); | 424 | // sceneObject.Name, sceneObject.UUID, sceneObject.Parts.Length, m_parentScene.RegionInfo.RegionName); |
425 | 425 | ||
426 | SceneObjectPart[] parts = sceneObject.Parts; | 426 | SceneObjectPart[] parts = sceneObject.Parts; |
@@ -456,7 +456,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
456 | 456 | ||
457 | lock (SceneObjectGroupsByFullID) | 457 | lock (SceneObjectGroupsByFullID) |
458 | SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject; | 458 | SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject; |
459 | 459 | ||
460 | lock (SceneObjectGroupsByFullPartID) | 460 | lock (SceneObjectGroupsByFullPartID) |
461 | { | 461 | { |
462 | foreach (SceneObjectPart part in parts) | 462 | foreach (SceneObjectPart part in parts) |
@@ -1678,7 +1678,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1678 | 1678 | ||
1679 | if (group != null) | 1679 | if (group != null) |
1680 | { | 1680 | { |
1681 | if (m_parentScene.Permissions.CanEditObject(group.UUID,agentID)) | 1681 | if (m_parentScene.Permissions.CanEditObject(group.UUID, agentID)) |
1682 | { | 1682 | { |
1683 | group.UpdateExtraParam(primLocalID, type, inUse, data); | 1683 | group.UpdateExtraParam(primLocalID, type, inUse, data); |
1684 | } | 1684 | } |
@@ -1695,7 +1695,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1695 | SceneObjectGroup group = GetGroupByPrim(primLocalID); | 1695 | SceneObjectGroup group = GetGroupByPrim(primLocalID); |
1696 | if (group != null) | 1696 | if (group != null) |
1697 | { | 1697 | { |
1698 | if (m_parentScene.Permissions.CanEditObject(group.GetPartsFullID(primLocalID), agentID)) | 1698 | if (m_parentScene.Permissions.CanEditObject(group.UUID, agentID)) |
1699 | { | 1699 | { |
1700 | ObjectShapePacket.ObjectDataBlock shapeData = new ObjectShapePacket.ObjectDataBlock(); | 1700 | ObjectShapePacket.ObjectDataBlock shapeData = new ObjectShapePacket.ObjectDataBlock(); |
1701 | shapeData.ObjectLocalID = shapeBlock.ObjectLocalID; | 1701 | shapeData.ObjectLocalID = shapeBlock.ObjectLocalID; |