aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-16 19:08:06 +0000
committerJustin Clark-Casey (justincc)2010-02-16 19:08:06 +0000
commit4c90ee29432539efbf5942010dd574822235ed57 (patch)
treed159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentminor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.zip
opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.gz
opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2
opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 1ac061a..321cc45 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -452,6 +452,15 @@ namespace OpenSim.Region.Framework.Scenes
452 part.Undo(); 452 part.Undo();
453 } 453 }
454 } 454 }
455 protected internal void HandleRedo(IClientAPI remoteClient, UUID primId)
456 {
457 if (primId != UUID.Zero)
458 {
459 SceneObjectPart part = m_parentScene.GetSceneObjectPart(primId);
460 if (part != null)
461 part.Redo();
462 }
463 }
455 464
456 protected internal void HandleObjectGroupUpdate( 465 protected internal void HandleObjectGroupUpdate(
457 IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) 466 IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage)
@@ -633,7 +642,7 @@ namespace OpenSim.Region.Framework.Scenes
633 // it get cleaned up 642 // it get cleaned up
634 // 643 //
635 group.RootPart.RemFlag(PrimFlags.TemporaryOnRez); 644 group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
636 group.HasGroupChanged = false; 645 group.HasGroupChanged = false;
637 } 646 }
638 else 647 else
639 { 648 {