diff options
author | Melanie Thielker | 2010-06-28 01:48:24 +0200 |
---|---|---|
committer | Melanie | 2010-06-28 01:43:26 +0100 |
commit | 85a9c305a202516b08b566b1120750010461022c (patch) | |
tree | 0a78d11b565729be02bd1835e577dae92fa39a64 /OpenSim/Region/Framework/Scenes | |
parent | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and (diff) | |
download | opensim-SC_OLD-85a9c305a202516b08b566b1120750010461022c.zip opensim-SC_OLD-85a9c305a202516b08b566b1120750010461022c.tar.gz opensim-SC_OLD-85a9c305a202516b08b566b1120750010461022c.tar.bz2 opensim-SC_OLD-85a9c305a202516b08b566b1120750010461022c.tar.xz |
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
used, but made for a very mispleading read of the code in the callers.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 5fea332..40332a6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1747,7 +1747,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1747 | { | 1747 | { |
1748 | if (m_parentScene.Permissions.CanDuplicateObject(original.Children.Count, original.UUID, AgentID, original.AbsolutePosition)) | 1748 | if (m_parentScene.Permissions.CanDuplicateObject(original.Children.Count, original.UUID, AgentID, original.AbsolutePosition)) |
1749 | { | 1749 | { |
1750 | SceneObjectGroup copy = original.Copy(AgentID, GroupID, true); | 1750 | SceneObjectGroup copy = original.Copy(true); |
1751 | copy.AbsolutePosition = copy.AbsolutePosition + offset; | 1751 | copy.AbsolutePosition = copy.AbsolutePosition + offset; |
1752 | 1752 | ||
1753 | if (original.OwnerID != AgentID) | 1753 | if (original.OwnerID != AgentID) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index fad470f..1ca390a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1472 | "[SCENE]: Storing {0}, {1} in {2}", | 1472 | "[SCENE]: Storing {0}, {1} in {2}", |
1473 | Name, UUID, m_scene.RegionInfo.RegionName); | 1473 | Name, UUID, m_scene.RegionInfo.RegionName); |
1474 | 1474 | ||
1475 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); | 1475 | SceneObjectGroup backup_group = Copy(false); |
1476 | backup_group.RootPart.Velocity = RootPart.Velocity; | 1476 | backup_group.RootPart.Velocity = RootPart.Velocity; |
1477 | backup_group.RootPart.Acceleration = RootPart.Acceleration; | 1477 | backup_group.RootPart.Acceleration = RootPart.Acceleration; |
1478 | backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity; | 1478 | backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity; |
@@ -1528,7 +1528,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1528 | /// Duplicates this object, including operations such as physics set up and attaching to the backup event. | 1528 | /// Duplicates this object, including operations such as physics set up and attaching to the backup event. |
1529 | /// </summary> | 1529 | /// </summary> |
1530 | /// <returns></returns> | 1530 | /// <returns></returns> |
1531 | public SceneObjectGroup Copy(UUID cAgentID, UUID cGroupID, bool userExposed) | 1531 | public SceneObjectGroup Copy(bool userExposed) |
1532 | { | 1532 | { |
1533 | SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); | 1533 | SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); |
1534 | dupe.m_isBackedUp = false; | 1534 | dupe.m_isBackedUp = false; |
@@ -3581,7 +3581,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3581 | 3581 | ||
3582 | public virtual ISceneObject CloneForNewScene() | 3582 | public virtual ISceneObject CloneForNewScene() |
3583 | { | 3583 | { |
3584 | SceneObjectGroup sog = Copy(this.OwnerID, this.GroupID, false); | 3584 | SceneObjectGroup sog = Copy(false); |
3585 | sog.m_isDeleted = false; | 3585 | sog.m_isDeleted = false; |
3586 | return sog; | 3586 | return sog; |
3587 | } | 3587 | } |