diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 08c7a58..d51281d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.ComponentModel; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Drawing; | 31 | using System.Drawing; |
31 | using System.IO; | 32 | using System.IO; |
@@ -911,6 +912,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
911 | public UUID FromItemID { get; set; } | 912 | public UUID FromItemID { get; set; } |
912 | 913 | ||
913 | /// <summary> | 914 | /// <summary> |
915 | /// Refers to the SceneObjectPart.UUID property of the object that this object was rezzed from, if applicable. | ||
916 | /// </summary> | ||
917 | /// <remarks> | ||
918 | /// If not applicable will be UUID.Zero | ||
919 | /// </remarks> | ||
920 | public UUID FromPartID { get; set; } | ||
921 | |||
922 | /// <summary> | ||
914 | /// The folder ID that this object was rezzed from, if applicable. | 923 | /// The folder ID that this object was rezzed from, if applicable. |
915 | /// </summary> | 924 | /// </summary> |
916 | /// <remarks> | 925 | /// <remarks> |
@@ -941,6 +950,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
941 | /// The original SceneObjectPart will be used rather than a copy, preserving | 950 | /// The original SceneObjectPart will be used rather than a copy, preserving |
942 | /// its existing localID and UUID. | 951 | /// its existing localID and UUID. |
943 | /// </summary> | 952 | /// </summary> |
953 | /// <param name='part'>Root part for this scene object.</param> | ||
944 | public SceneObjectGroup(SceneObjectPart part) | 954 | public SceneObjectGroup(SceneObjectPart part) |
945 | { | 955 | { |
946 | SetRootPart(part); | 956 | SetRootPart(part); |