aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorBlueWall2012-02-03 18:20:26 -0500
committerBlueWall2012-02-03 18:20:26 -0500
commit0742630d813259483f0e56d1c6b807de78924c54 (patch)
tree8dacf402c0cd7065403f1f8c9735214825011448 /OpenSim/Region/CoreModules
parentExtend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff)
parentFix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... (diff)
downloadopensim-SC-0742630d813259483f0e56d1c6b807de78924c54.zip
opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.tar.gz
opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.tar.bz2
opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.tar.xz
Merge branch 'master' of /home/opensim/src/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 }