aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs14
3 files changed, 15 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 11024d6..3cd0652 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -139,8 +139,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
139 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid 139 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid
140 // otherwise, use the master avatar uuid instead 140 // otherwise, use the master avatar uuid instead
141 UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; 141 UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
142
142 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 143 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
143 masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; 144 masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner;
145
144 foreach (SceneObjectPart part in sceneObject.Children.Values) 146 foreach (SceneObjectPart part in sceneObject.Children.Values)
145 { 147 {
146 if (!resolveUserUuid(part.CreatorID)) 148 if (!resolveUserUuid(part.CreatorID))
@@ -153,8 +155,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
153 part.LastOwnerID = masterAvatarId; 155 part.LastOwnerID = masterAvatarId;
154 156
155 // And zap any troublesome sit target information 157 // And zap any troublesome sit target information
156 part.SitTargetOrientation = new Quaternion(0,0,0,1); 158 part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
157 part.SitTargetPosition = new Vector3(0,0,0); 159 part.SitTargetPosition = new Vector3(0, 0, 0);
158 160
159 // Fix ownership/creator of inventory items 161 // Fix ownership/creator of inventory items
160 // Not doing so results in inventory items 162 // Not doing so results in inventory items
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e5d0c3f..7019673 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1830,7 +1830,7 @@ namespace OpenSim.Region.Environment.Scenes
1830 } 1830 }
1831 1831
1832 /// <summary> 1832 /// <summary>
1833 /// Delete the given object from the scene. 1833 /// Synchronously delete the given object from the scene.
1834 /// </summary> 1834 /// </summary>
1835 /// <param name="group"></param> 1835 /// <param name="group"></param>
1836 public void DeleteSceneObject(SceneObjectGroup group, bool silent) 1836 public void DeleteSceneObject(SceneObjectGroup group, bool silent)
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
index c5bb9aa..ba03bfc 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
@@ -107,12 +107,18 @@ namespace OpenSim.Region.Environment.Scenes.Tests
107 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); 107 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
108 } 108 }
109 109
110 /* 110 /// <summary>
111 /// Test removing an object from a scene.
112 /// </summary>
111 public void TestRemoveSceneObject() 113 public void TestRemoveSceneObject()
112 { 114 {
113 Scene scene = SetupScene(); 115 TestScene scene = SetupScene();;
114 SceneObjectPart part = AddSceneObject(scene); 116 SceneObjectPart part = AddSceneObject(scene);
117 scene.DeleteSceneObject(part.ParentGroup, false);
118
119 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
120
121 Assert.That(retrievedPart, Is.Null);
115 } 122 }
116 */
117 } 123 }
118} \ No newline at end of file 124} \ No newline at end of file