diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 19 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3586e95..17f3be7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -586,10 +586,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
586 | } | 586 | } |
587 | } | 587 | } |
588 | 588 | ||
589 | /// <summary> | 589 | /// <summary> |
590 | /// The item ID that this object was rezzed from, if applicable. | 590 | /// The item ID that this object was rezzed from, if applicable. |
591 | /// </summary> | 591 | /// </summary> |
592 | public UUID FromItemID { get; set; } | 592 | /// <remarks> |
593 | /// If not applicable will be UUID.Zero | ||
594 | /// </remarks> | ||
595 | public UUID FromItemID { get; set; } | ||
596 | |||
597 | /// <summary> | ||
598 | /// The folder ID that this object was rezzed from, if applicable. | ||
599 | /// </summary> | ||
600 | /// <remarks> | ||
601 | /// If not applicable will be UUID.Zero | ||
602 | /// </remarks> | ||
603 | public UUID FromFolderID { get; set; } | ||
593 | 604 | ||
594 | #endregion | 605 | #endregion |
595 | 606 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index fffaa06..046553b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -182,8 +182,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
182 | 182 | ||
183 | public uint TimeStampTerse; | 183 | public uint TimeStampTerse; |
184 | 184 | ||
185 | public UUID FromFolderID; | ||
186 | |||
187 | public int STATUS_ROTATE_X; | 185 | public int STATUS_ROTATE_X; |
188 | 186 | ||
189 | public int STATUS_ROTATE_Y; | 187 | public int STATUS_ROTATE_Y; |