diff options
| author | Melanie | 2011-03-21 05:52:29 +0100 |
|---|---|---|
| committer | Melanie | 2011-03-21 05:52:29 +0100 |
| commit | 7b11a83c08928166cc3286cc03265180003690c7 (patch) | |
| tree | ceb54dd2bc32d7c2c03adebe46d6f207c7f0d44b /OpenSim | |
| parent | Revert "Switch Vivox voice module to https" (diff) | |
| download | opensim-SC-7b11a83c08928166cc3286cc03265180003690c7.zip opensim-SC-7b11a83c08928166cc3286cc03265180003690c7.tar.gz opensim-SC-7b11a83c08928166cc3286cc03265180003690c7.tar.bz2 opensim-SC-7b11a83c08928166cc3286cc03265180003690c7.tar.xz | |
Don't send a windlight profile to clients if windlight is not set for
that region. This should restore normal day and night cycles for
regions without WL settings.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs index 88f392d..40dd6c0 100644 --- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |||
| @@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
| 148 | public void SendProfileToClient(ScenePresence presence) | 148 | public void SendProfileToClient(ScenePresence presence) |
| 149 | { | 149 | { |
| 150 | IClientAPI client = presence.ControllingClient; | 150 | IClientAPI client = presence.ControllingClient; |
| 151 | if (m_enableWindlight) | 151 | if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid) |
| 152 | { | 152 | { |
| 153 | if (presence.IsChildAgent == false) | 153 | if (presence.IsChildAgent == false) |
| 154 | { | 154 | { |
| @@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
| 165 | public void SendProfileToClient(ScenePresence presence, RegionLightShareData wl) | 165 | public void SendProfileToClient(ScenePresence presence, RegionLightShareData wl) |
| 166 | { | 166 | { |
| 167 | IClientAPI client = presence.ControllingClient; | 167 | IClientAPI client = presence.ControllingClient; |
| 168 | if (m_enableWindlight) | 168 | if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid) |
| 169 | { | 169 | { |
| 170 | if (presence.IsChildAgent == false) | 170 | if (presence.IsChildAgent == false) |
| 171 | { | 171 | { |