diff options
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 4c43389..cc5dfa1 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -182,10 +182,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
182 | 182 | ||
183 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid | 183 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid |
184 | // otherwise, use the master avatar uuid instead | 184 | // otherwise, use the master avatar uuid instead |
185 | UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
186 | |||
187 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | ||
188 | masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
189 | 185 | ||
190 | // Reload serialized parcels | 186 | // Reload serialized parcels |
191 | m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); | 187 | m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); |
@@ -194,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
194 | { | 190 | { |
195 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); | 191 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); |
196 | if (!ResolveUserUuid(parcel.OwnerID)) | 192 | if (!ResolveUserUuid(parcel.OwnerID)) |
197 | parcel.OwnerID = masterAvatarId; | 193 | parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
198 | landData.Add(parcel); | 194 | landData.Add(parcel); |
199 | } | 195 | } |
200 | m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); | 196 | m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); |
@@ -233,13 +229,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
233 | foreach (SceneObjectPart part in sceneObject.Children.Values) | 229 | foreach (SceneObjectPart part in sceneObject.Children.Values) |
234 | { | 230 | { |
235 | if (!ResolveUserUuid(part.CreatorID)) | 231 | if (!ResolveUserUuid(part.CreatorID)) |
236 | part.CreatorID = masterAvatarId; | 232 | part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
237 | 233 | ||
238 | if (!ResolveUserUuid(part.OwnerID)) | 234 | if (!ResolveUserUuid(part.OwnerID)) |
239 | part.OwnerID = masterAvatarId; | 235 | part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
240 | 236 | ||
241 | if (!ResolveUserUuid(part.LastOwnerID)) | 237 | if (!ResolveUserUuid(part.LastOwnerID)) |
242 | part.LastOwnerID = masterAvatarId; | 238 | part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
243 | 239 | ||
244 | // And zap any troublesome sit target information | 240 | // And zap any troublesome sit target information |
245 | part.SitTargetOrientation = new Quaternion(0, 0, 0, 1); | 241 | part.SitTargetOrientation = new Quaternion(0, 0, 0, 1); |
@@ -255,11 +251,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
255 | { | 251 | { |
256 | if (!ResolveUserUuid(kvp.Value.OwnerID)) | 252 | if (!ResolveUserUuid(kvp.Value.OwnerID)) |
257 | { | 253 | { |
258 | kvp.Value.OwnerID = masterAvatarId; | 254 | kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
259 | } | 255 | } |
260 | if (!ResolveUserUuid(kvp.Value.CreatorID)) | 256 | if (!ResolveUserUuid(kvp.Value.CreatorID)) |
261 | { | 257 | { |
262 | kvp.Value.CreatorID = masterAvatarId; | 258 | kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
263 | } | 259 | } |
264 | } | 260 | } |
265 | } | 261 | } |