diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 4c3d00e..1e6955a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -439,10 +439,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
439 | protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) | 439 | protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) |
440 | { | 440 | { |
441 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | 441 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); |
442 | if( group != null ) | 442 | if (group != null) |
443 | { | 443 | { |
444 | //group.DetachToGround(); | 444 | //group.DetachToGround(); |
445 | m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(),remoteClient); | 445 | m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient); |
446 | } | 446 | } |
447 | } | 447 | } |
448 | 448 | ||
@@ -460,7 +460,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
460 | IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) | 460 | IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) |
461 | { | 461 | { |
462 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | 462 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); |
463 | if( group != null ) | 463 | if (group != null) |
464 | { | 464 | { |
465 | if (group.OwnerID == remoteClient.AgentId) | 465 | if (group.OwnerID == remoteClient.AgentId) |
466 | group.SetGroup(GroupID, remoteClient); | 466 | group.SetGroup(GroupID, remoteClient); |
@@ -553,7 +553,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
553 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) | 553 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) |
554 | { | 554 | { |
555 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | 555 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); |
556 | if( group != null ) | 556 | if (group != null) |
557 | { | 557 | { |
558 | if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) | 558 | if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) |
559 | { | 559 | { |
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1534 | for (int i = childPrimIds.Count - 1; i >= 0; i--) | 1534 | for (int i = childPrimIds.Count - 1; i >= 0; i--) |
1535 | { | 1535 | { |
1536 | SceneObjectGroup child = GetGroupByPrim(childPrimIds[i]); | 1536 | SceneObjectGroup child = GetGroupByPrim(childPrimIds[i]); |
1537 | if( child != null ) | 1537 | if (child != null) |
1538 | { | 1538 | { |
1539 | // Make sure no child prim is set for sale | 1539 | // Make sure no child prim is set for sale |
1540 | // So that, on delink, no prims are unwittingly | 1540 | // So that, on delink, no prims are unwittingly |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 4fdc71e..8e4a9d3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2357,7 +2357,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2357 | { | 2357 | { |
2358 | if (m_rootPart.PhysActor.IsPhysical) | 2358 | if (m_rootPart.PhysActor.IsPhysical) |
2359 | { | 2359 | { |
2360 | if(m_rootPart.IsWaitingForFirstSpinUpdatePacket) | 2360 | if (m_rootPart.IsWaitingForFirstSpinUpdatePacket) |
2361 | { | 2361 | { |
2362 | // first time initialization of "old" orientation for calculation of delta rotations | 2362 | // first time initialization of "old" orientation for calculation of delta rotations |
2363 | m_rootPart.SpinOldOrientation = newOrientation; | 2363 | m_rootPart.SpinOldOrientation = newOrientation; |