From 4ab9d37a8e556fe7f54d70db922eede861bce812 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 3 Nov 2010 02:04:17 +0000
Subject: When LightShare is enabled, the standard day cycle is bypassed and
 replaced by midday defaults when no specific LightShare profile is set. This
 prevents LightShare info being send out when the region has no LightShare
 profile, allowing normal day/night cycles to happen.

---
 OpenSim/Data/MySQL/MySQLSimulationData.cs                       | 1 +
 OpenSim/Framework/RegionInfo.cs                                 | 1 +
 OpenSim/Region/CoreModules/LightShare/LightShareModule.cs       | 3 ++-
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index e2b6953..b53c67b 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -817,6 +817,7 @@ namespace OpenSim.Data.MySQL
                         nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
                         nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
                         nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                        nWP.valid = true;
                     }
                 }
             }
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 08d5398..176a523 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework
 {
     public class RegionLightShareData : ICloneable
     {
+        public bool valid = false;
         public UUID regionID = UUID.Zero;
         public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f);
         public float waterFogDensityExponent = 4.0f;
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
index 412dbb6..88f392d 100644
--- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
@@ -194,7 +194,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         }
         private void EventManager_OnSaveNewWindlightProfile()
         {
-            m_scene.ForEachScenePresence(SendProfileToClient);
+            if (m_scene.RegionInfo.WindlightSettings.valid)
+                m_scene.ForEachScenePresence(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 665b39f..24a93c5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -455,6 +455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (LightShareModule.EnableWindlight)
             {
                 RegionLightShareData wl = getWindlightProfileFromRules(rules);
+                wl.valid = true;
                 m_host.ParentGroup.Scene.StoreWindlightProfile(wl);
                 success = 1;
             }
-- 
cgit v1.1