aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2010-09-14 22:03:42 +0100
committerMelanie2010-09-14 22:03:42 +0100
commit1212cb0c7442619f47f3937d0d8b7ed0ee5f6090 (patch)
tree776d0ff51f06ad2a30dbbacb7ddfd183766f0344 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentFix a small left over buglet and also add checking of the physics actor (diff)
parentFix "show threads" to show threads now being managed by OpenSim.Framework.Wat... (diff)
downloadopensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.zip
opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.gz
opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.bz2
opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 6246400..9c3486e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -568,16 +568,6 @@ namespace OpenSim.Region.Framework.Scenes
568 m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient); 568 m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient);
569 } 569 }
570 570
571 protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient)
572 {
573 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
574 if (group != null)
575 {
576 //group.DetachToGround();
577 m_parentScene.AttachmentsModule.ShowDetachInUserInventory(group.GetFromItemID(), remoteClient);
578 }
579 }
580
581 protected internal void HandleUndo(IClientAPI remoteClient, UUID primId) 571 protected internal void HandleUndo(IClientAPI remoteClient, UUID primId)
582 { 572 {
583 if (primId != UUID.Zero) 573 if (primId != UUID.Zero)