diff options
author | UbitUmarov | 2016-12-04 17:56:47 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-04 17:56:47 +0000 |
commit | 51104be6d41170bc17d0d24278868b6c1cddfed7 (patch) | |
tree | 09ee6d57dde7d4d47dffff785d5b1576e1e4956b /OpenSim/Region/Framework | |
parent | The new Constant: integer OBJECT_REZZER_KEY = 32; (diff) | |
download | opensim-SC_OLD-51104be6d41170bc17d0d24278868b6c1cddfed7.zip opensim-SC_OLD-51104be6d41170bc17d0d24278868b6c1cddfed7.tar.gz opensim-SC_OLD-51104be6d41170bc17d0d24278868b6c1cddfed7.tar.bz2 opensim-SC_OLD-51104be6d41170bc17d0d24278868b6c1cddfed7.tar.xz |
remove SOG.FromPartID from main code and flag it obsolete
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index daf7741..61ea8ac 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2624,8 +2624,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2624 | group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint; | 2624 | group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint; |
2625 | } | 2625 | } |
2626 | 2626 | ||
2627 | group.FromPartID = sourcePart.UUID; | 2627 | group.RezzerID = sourcePart.UUID; |
2628 | group.RezzerID = group.FromPartID; | ||
2629 | 2628 | ||
2630 | if( i == 0) | 2629 | if( i == 0) |
2631 | AddNewSceneObject(group, true, curpos, rot, vel); | 2630 | AddNewSceneObject(group, true, curpos, rot, vel); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index fcbcc3f..e42b675 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1059,7 +1059,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1059 | /// <remarks> | 1059 | /// <remarks> |
1060 | /// If not applicable will be UUID.Zero | 1060 | /// If not applicable will be UUID.Zero |
1061 | /// </remarks> | 1061 | /// </remarks> |
1062 | public UUID FromPartID { get; set; } | 1062 | /// obsolete use RezzerID |
1063 | public UUID FromPartID | ||
1064 | { | ||
1065 | get { return RezzerID; } | ||
1066 | set {RezzerID = value; } | ||
1067 | } | ||
1063 | 1068 | ||
1064 | /// <summary> | 1069 | /// <summary> |
1065 | /// The folder ID that this object was rezzed from, if applicable. | 1070 | /// The folder ID that this object was rezzed from, if applicable. |