aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDan Lake2012-02-03 15:21:37 -0800
committerDan Lake2012-02-03 15:21:37 -0800
commit4f8f44d9c3f42fbd841264fbede3e10ca253d016 (patch)
treee6e26d76ef58c9422a6cf030580c1f7377d7d931 /OpenSim/Region/CoreModules
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
downloadopensim-SC-4f8f44d9c3f42fbd841264fbede3e10ca253d016.zip
opensim-SC-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.gz
opensim-SC-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.bz2
opensim-SC-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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 }