diff options
author | Melanie | 2011-12-24 16:18:01 +0100 |
---|---|---|
committer | Melanie | 2011-12-24 16:18:01 +0100 |
commit | 41f6d6a5fff5251764db5f637fa197f1bb14a7cd (patch) | |
tree | 415e8d40ed13e88ed1c939f0c3438036fe956089 /OpenSim | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
download | opensim-SC-41f6d6a5fff5251764db5f637fa197f1bb14a7cd.zip opensim-SC-41f6d6a5fff5251764db5f637fa197f1bb14a7cd.tar.gz opensim-SC-41f6d6a5fff5251764db5f637fa197f1bb14a7cd.tar.bz2 opensim-SC-41f6d6a5fff5251764db5f637fa197f1bb14a7cd.tar.xz |
Introduce a LightShare kill packet ans send it when needed. Currently only
understood by AVN v0.3
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 1 |
2 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs index 41a80ce..f49641f 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 | |||
153 | 153 | ||
154 | public void SendProfileToClient(IClientAPI client, RegionLightShareData wl) | 154 | public void SendProfileToClient(IClientAPI client, RegionLightShareData wl) |
155 | { | 155 | { |
156 | if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid) | 156 | if (m_enableWindlight) |
157 | { | 157 | { |
158 | List<byte[]> param = compileWindlightSettings(wl); | 158 | if (m_scene.RegionInfo.WindlightSettings.valid) |
159 | client.SendGenericMessage("Windlight", param); | 159 | { |
160 | List<byte[]> param = compileWindlightSettings(wl); | ||
161 | client.SendGenericMessage("Windlight", param); | ||
162 | } | ||
163 | else | ||
164 | { | ||
165 | List<byte[]> param = new List<byte[]>(); | ||
166 | client.SendGenericMessage("WindlightReset", param); | ||
167 | } | ||
160 | } | 168 | } |
161 | } | 169 | } |
162 | 170 | ||
@@ -176,8 +184,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
176 | 184 | ||
177 | private void EventManager_OnSaveNewWindlightProfile() | 185 | private void EventManager_OnSaveNewWindlightProfile() |
178 | { | 186 | { |
179 | if (m_scene.RegionInfo.WindlightSettings.valid) | 187 | m_scene.ForEachRootClient(SendProfileToClient); |
180 | m_scene.ForEachRootClient(SendProfileToClient); | ||
181 | } | 188 | } |
182 | 189 | ||
183 | public void PostInitialise() | 190 | 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 | |||
486 | m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false; | 486 | m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false; |
487 | if (m_host.ParentGroup.Scene.SimulationDataService != null) | 487 | if (m_host.ParentGroup.Scene.SimulationDataService != null) |
488 | m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID); | 488 | m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID); |
489 | m_host.ParentGroup.Scene.EventManager.TriggerOnSaveNewWindlightProfile(); | ||
489 | } | 490 | } |
490 | /// <summary> | 491 | /// <summary> |
491 | /// Set the current Windlight scene to a target avatar | 492 | /// Set the current Windlight scene to a target avatar |