aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-12 20:35:35 +0000
committerJustin Clarke Casey2008-11-12 20:35:35 +0000
commit2c7ac336500cb3b02f42ea47934cc11b31ac397f (patch)
tree7a01eaa5cec5ee1ab456d4959a331edda27b83ae /OpenSim/Region/Environment/Modules
parent* refactor: as per a recent opensim-dev thread, rename InnerScene to SceneGra... (diff)
downloadopensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.zip
opensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.tar.gz
opensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.tar.bz2
opensim-SC-2c7ac336500cb3b02f42ea47934cc11b31ac397f.tar.xz
* test: Add basic synchronous object remove test
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs6
1 files changed, 4 insertions, 2 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