diff options
author | Melanie Thielker | 2010-06-28 01:48:24 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-06-28 01:48:24 +0200 |
commit | a817f6b48c27fe5e950846d687edcd4d375a3c6c (patch) | |
tree | 604aa99d556e05b44991282840f968182f4d85dc /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and (diff) | |
download | opensim-SC-a817f6b48c27fe5e950846d687edcd4d375a3c6c.zip opensim-SC-a817f6b48c27fe5e950846d687edcd4d375a3c6c.tar.gz opensim-SC-a817f6b48c27fe5e950846d687edcd4d375a3c6c.tar.bz2 opensim-SC-a817f6b48c27fe5e950846d687edcd4d375a3c6c.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 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 241295f..c48ce3b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1700,7 +1700,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1700 | "[SCENE]: Storing {0}, {1} in {2}", | 1700 | "[SCENE]: Storing {0}, {1} in {2}", |
1701 | Name, UUID, m_scene.RegionInfo.RegionName); | 1701 | Name, UUID, m_scene.RegionInfo.RegionName); |
1702 | 1702 | ||
1703 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); | 1703 | SceneObjectGroup backup_group = Copy(false); |
1704 | backup_group.RootPart.Velocity = RootPart.Velocity; | 1704 | backup_group.RootPart.Velocity = RootPart.Velocity; |
1705 | backup_group.RootPart.Acceleration = RootPart.Acceleration; | 1705 | backup_group.RootPart.Acceleration = RootPart.Acceleration; |
1706 | backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity; | 1706 | backup_group.RootPart.AngularVelocity = RootPart.AngularVelocity; |
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1758 | /// Duplicates this object, including operations such as physics set up and attaching to the backup event. | 1758 | /// Duplicates this object, including operations such as physics set up and attaching to the backup event. |
1759 | /// </summary> | 1759 | /// </summary> |
1760 | /// <returns></returns> | 1760 | /// <returns></returns> |
1761 | public SceneObjectGroup Copy(UUID cAgentID, UUID cGroupID, bool userExposed) | 1761 | public SceneObjectGroup Copy(bool userExposed) |
1762 | { | 1762 | { |
1763 | SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); | 1763 | SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); |
1764 | dupe.m_isBackedUp = false; | 1764 | dupe.m_isBackedUp = false; |
@@ -3897,7 +3897,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3897 | 3897 | ||
3898 | public virtual ISceneObject CloneForNewScene() | 3898 | public virtual ISceneObject CloneForNewScene() |
3899 | { | 3899 | { |
3900 | SceneObjectGroup sog = Copy(this.OwnerID, this.GroupID, false); | 3900 | SceneObjectGroup sog = Copy(false); |
3901 | sog.m_isDeleted = false; | 3901 | sog.m_isDeleted = false; |
3902 | return sog; | 3902 | return sog; |
3903 | } | 3903 | } |