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/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

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


From 6c3b7617b0356f093ef2730f1c517d6228997984 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 3 Nov 2010 02:31:43 +0000
Subject: Add lsClearWindlightScene() to the lightshare module to remove WL
 settings from a region and allow normal day cycles to be reestablished

---
 .../ScriptEngine/Shared/Api/Implementation/LS_Api.cs    | 17 +++++++++++++++++
 .../Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs |  1 +
 .../Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs   |  4 ++++
 3 files changed, 22 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 24a93c5..645566e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -466,6 +466,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             return success;
         }
+        public void lsClearWindlightScene()
+        {
+            if (!m_LSFunctionsEnabled)
+            {
+                LSShoutError("LightShare functions are not enabled.");
+                return;
+            }
+            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            {
+                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
+                return;
+            }
+
+            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);
+        }
         /// <summary>
         /// Set the current Windlight scene to a target avatar
         /// </summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs
index 9aa437b..f2df094 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs
@@ -44,5 +44,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_List lsGetWindlightScene(LSL_List rules);
         int lsSetWindlightScene(LSL_List rules);
         int lsSetWindlightSceneTargeted(LSL_List rules, key target);
+        void lsClearWindlightScene();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index f8dbe03..143b497 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,5 +72,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
         }
+        public void lsClearWindlightScene()
+        {
+            m_LS_Functions.lsClearWindlightScene();
+        }
     }
 }
-- 
cgit v1.1