aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2011-12-18 10:49:45 +0000
committerMelanie2011-12-18 10:49:45 +0000
commit759f1d2dbe0617786068195dfd695e0dfc2cc265 (patch)
tree8e6dcb6ba183abb16b4527376c5fd280693977bb /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentMake raycast more efficient by checking exclusion flags earlier (diff)
parentProvide user feedback on execution of "backup" region console command (diff)
downloadopensim-SC-759f1d2dbe0617786068195dfd695e0dfc2cc265.zip
opensim-SC-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.gz
opensim-SC-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.bz2
opensim-SC-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs14
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index c16038c..cd825eb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -640,20 +640,6 @@ namespace OpenSim.Region.Framework.Scenes
640 } 640 }
641 } 641 }
642 642
643 protected internal void HandleObjectGroupUpdate(
644 IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage)
645 {
646 if (!remoteClient.IsGroupMember(GroupID))
647 return;
648
649 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
650 if (group != null)
651 {
652 if (group.OwnerID == remoteClient.AgentId)
653 group.SetGroup(GroupID, remoteClient);
654 }
655 }
656
657 protected internal ScenePresence CreateAndAddChildScenePresence( 643 protected internal ScenePresence CreateAndAddChildScenePresence(
658 IClientAPI client, AvatarAppearance appearance, PresenceType type) 644 IClientAPI client, AvatarAppearance appearance, PresenceType type)
659 { 645 {