diff options
Had to rename Rotation in SceneObjectGroup to GroupRotation to stop conflict with Rotation in entitybase (couldn't override as they are different types (LL vs Axiom) and didn't want to add new).
When you take prims into inventory (or delete them), they should now be removed from the prim datastore, so they no longer reappear in-world when you restart opensim.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index a5ad2e6..ec62509 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -35,12 +35,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
35 | get { return 1; } | 35 | get { return 1; } |
36 | } | 36 | } |
37 | 37 | ||
38 | public LLQuaternion Rotation | 38 | public LLQuaternion GroupRotation |
39 | { | 39 | { |
40 | get { return m_rootPart.RotationOffset; } | 40 | get { return m_rootPart.RotationOffset; } |
41 | } | 41 | } |
42 | 42 | ||
43 | |||
44 | /// <summary> | 43 | /// <summary> |
45 | /// | 44 | /// |
46 | /// </summary> | 45 | /// </summary> |
@@ -538,7 +537,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
538 | SceneObjectPart part = this.GetChildPrim(localID); | 537 | SceneObjectPart part = this.GetChildPrim(localID); |
539 | if (part != null) | 538 | if (part != null) |
540 | { | 539 | { |
541 | return part.PartName; | 540 | return part.Name; |
542 | } | 541 | } |
543 | return ""; | 542 | return ""; |
544 | } | 543 | } |