diff options
author | Dan Lake | 2011-12-20 14:46:44 -0800 |
---|---|---|
committer | Dan Lake | 2011-12-20 14:46:44 -0800 |
commit | 7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd (patch) | |
tree | 3de2f42376d23ead500098d98e6d2bbd6e21feda /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
download | opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.zip opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.gz opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.bz2 opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index af95c28..a3e4b46 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -575,20 +575,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
575 | } | 575 | } |
576 | } | 576 | } |
577 | 577 | ||
578 | protected internal void HandleObjectGroupUpdate( | ||
579 | IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) | ||
580 | { | ||
581 | if (!remoteClient.IsGroupMember(GroupID)) | ||
582 | return; | ||
583 | |||
584 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | ||
585 | if (group != null) | ||
586 | { | ||
587 | if (group.OwnerID == remoteClient.AgentId) | ||
588 | group.SetGroup(GroupID, remoteClient); | ||
589 | } | ||
590 | } | ||
591 | |||
592 | protected internal ScenePresence CreateAndAddChildScenePresence( | 578 | protected internal ScenePresence CreateAndAddChildScenePresence( |
593 | IClientAPI client, AvatarAppearance appearance, PresenceType type) | 579 | IClientAPI client, AvatarAppearance appearance, PresenceType type) |
594 | { | 580 | { |