2 files changed, 13 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
index cabbd31..16cbbf5 100644
--- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
@@ -153,10 +153,18 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         public void SendProfileToClient(IClientAPI client, RegionLightShareData wl)
         {
-            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
+            if (m_enableWindlight)
             {
-                List<byte[]> param = compileWindlightSettings(wl);
-                client.SendGenericMessage("Windlight", param);
+                if (m_scene.RegionInfo.WindlightSettings.valid)
+                {
+                    List<byte[]> param = compileWindlightSettings(wl);
+                    client.SendGenericMessage("Windlight", param);
+                }
+                else
+                {
+                    List<byte[]> param = new List<byte[]>();
+                    client.SendGenericMessage("WindlightReset", param);
+                }
             }
         }
 
@@ -175,8 +183,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void EventManager_OnSaveNewWindlightProfile()
         {
-            if (m_scene.RegionInfo.WindlightSettings.valid)
-                m_scene.ForEachRootClient(SendProfileToClient);
+            m_scene.ForEachRootClient(SendProfileToClient);
         }
 
         public void PostInitialise()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index cb0d765..77a784d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -486,6 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false;
             if (m_host.ParentGroup.Scene.SimulationDataService != null)
                 m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID);
+            m_host.ParentGroup.Scene.EventManager.TriggerOnSaveNewWindlightProfile();
         }
         /// <summary>
         /// Set the current Windlight scene to a target avatar