diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 948aac8..8e29e3c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -310,10 +310,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
310 | 310 | ||
311 | protected AssetBase PostProcess(AssetBase asset) | 311 | protected AssetBase PostProcess(AssetBase asset) |
312 | { | 312 | { |
313 | if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("profile")) | 313 | if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home")) |
314 | { | 314 | { |
315 | //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID); | 315 | //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID); |
316 | string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["profile"].ToString(), m_userAccountService, m_scopeID); | 316 | string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["home"].ToString(), m_userAccountService, m_scopeID); |
317 | asset.Data = Utils.StringToBytes(xml); | 317 | asset.Data = Utils.StringToBytes(xml); |
318 | } | 318 | } |
319 | return asset; | 319 | return asset; |
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 2e1487f..c303d6d 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -80,6 +80,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
80 | GetEstateFlags(), | 80 | GetEstateFlags(), |
81 | sun, | 81 | sun, |
82 | Scene.RegionInfo.RegionSettings.Covenant, | 82 | Scene.RegionInfo.RegionSettings.Covenant, |
83 | (uint) Scene.RegionInfo.RegionSettings.CovenantChangedDateTime, | ||
83 | Scene.RegionInfo.EstateSettings.AbuseEmail, | 84 | Scene.RegionInfo.EstateSettings.AbuseEmail, |
84 | estateOwner); | 85 | estateOwner); |
85 | 86 | ||
@@ -268,6 +269,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
268 | // remoteClient.Name, estateCovenantID); | 269 | // remoteClient.Name, estateCovenantID); |
269 | 270 | ||
270 | Scene.RegionInfo.RegionSettings.Covenant = estateCovenantID; | 271 | Scene.RegionInfo.RegionSettings.Covenant = estateCovenantID; |
272 | Scene.RegionInfo.RegionSettings.CovenantChangedDateTime = Util.UnixTimeSinceEpoch(); | ||
271 | Scene.RegionInfo.RegionSettings.Save(); | 273 | Scene.RegionInfo.RegionSettings.Save(); |
272 | TriggerRegionInfoChange(); | 274 | TriggerRegionInfoChange(); |
273 | } | 275 | } |