aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-03 23:48:12 +0000
committerJustin Clark-Casey (justincc)2012-02-03 23:48:12 +0000
commit2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598 (patch)
tree95acd2d2fc13dd77637549d8ce1f0ba78d4eb10d /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
parentChange SceneObjectSerializer to use common ExternalRepresentationUtils.Execut... (diff)
parentMerge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.zip
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.gz
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.bz2
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs2
1 files changed, 2 insertions, 0 deletions
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 }