From 4aa483777b244962b0bc8d4048cd8b9f021c40e6 Mon Sep 17 00:00:00 2001 From: Dev Random Date: Wed, 2 Apr 2014 00:32:29 -0400 Subject: Move new Estate commands to OpenSim.cs Signed-off-by: Michael Cerquoni --- .../World/Estate/EstateManagementModule.cs | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs') diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index ae956e6..54a7302 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -251,8 +251,17 @@ namespace OpenSim.Region.CoreModules.World.Estate m_log.InfoFormat("[ESTATE]: Estate Owner for {0} changed to {1} ({2} {3})", dbSettings.EstateName, account.PrincipalID, account.FirstName, account.LastName); - TriggerEstateInfoChange(); - sendRegionHandshakeToAll(); + // propagate the change + List regions = Scene.GetEstateRegions(estateID); + UUID regionId = (regions.Count() > 0) ? regions.ElementAt(0) : UUID.Zero; + if (regionId != UUID.Zero) + { + ChangeDelegate change = OnEstateInfoChange; + + if (change != null) + change(regionId); + } + } return response; } @@ -289,8 +298,16 @@ namespace OpenSim.Region.CoreModules.World.Estate // make sure there's a log entry to document the change m_log.InfoFormat("[ESTATE]: Estate {0} renamed from \"{1}\" to \"{2}\"", estateID, oldName, newName); - TriggerEstateInfoChange(); - sendRegionHandshakeToAll(); + // propagate the change + List regions = Scene.GetEstateRegions(estateID); + UUID regionId = (regions.Count() > 0) ? regions.ElementAt(0) : UUID.Zero; + if (regionId != UUID.Zero) + { + ChangeDelegate change = OnEstateInfoChange; + + if (change != null) + change(regionId); + } } } return response; -- cgit v1.1