diff options
| author | Melanie | 2010-09-13 23:35:27 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-13 23:35:27 +0100 |
| commit | b2e50474dcc0e6c762cd3455fef73874e5ce4906 (patch) | |
| tree | d0cca66cc22920d9b012e883f30c7a40ab5e05c2 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Add a missing parenthesis (diff) | |
| parent | Comment out SOG storing debug log message (diff) | |
| download | opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.zip opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.gz opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.bz2 opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 5ac8ff5..85ff32e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -522,16 +522,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 522 | m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient); | 522 | m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient); |
| 523 | } | 523 | } |
| 524 | 524 | ||
| 525 | protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) | ||
| 526 | { | ||
| 527 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | ||
| 528 | if (group != null) | ||
| 529 | { | ||
| 530 | //group.DetachToGround(); | ||
| 531 | m_parentScene.AttachmentsModule.ShowDetachInUserInventory(group.GetFromItemID(), remoteClient); | ||
| 532 | } | ||
| 533 | } | ||
| 534 | |||
| 535 | protected internal void HandleUndo(IClientAPI remoteClient, UUID primId) | 525 | protected internal void HandleUndo(IClientAPI remoteClient, UUID primId) |
| 536 | { | 526 | { |
| 537 | if (primId != UUID.Zero) | 527 | if (primId != UUID.Zero) |