aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-03-21 05:52:29 +0100
committerMelanie2011-03-21 08:02:56 +0000
commitfb890e543f1684e0c01f7a57f312ab1d7140cdc0 (patch)
tree6ee92da807f23c7a57b03f5311f9dd6277230225 /OpenSim
parentUpgrade SQLite: (diff)
downloadopensim-SC_OLD-fb890e543f1684e0c01f7a57f312ab1d7140cdc0.zip
opensim-SC_OLD-fb890e543f1684e0c01f7a57f312ab1d7140cdc0.tar.gz
opensim-SC_OLD-fb890e543f1684e0c01f7a57f312ab1d7140cdc0.tar.bz2
opensim-SC_OLD-fb890e543f1684e0c01f7a57f312ab1d7140cdc0.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 '')
-rw-r--r--OpenSim/Region/CoreModules/LightShare/LightShareModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
index 00b0aa9..2de8d7a 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 {