diff options
| author | Melanie | 2012-11-04 22:37:28 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-04 22:37:28 +0000 |
| commit | dd416298f1da71b801c789367a4408f5c2728df1 (patch) | |
| tree | 9aa8ed8419dd536fe2f326755ad3468289818ffc /OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
| download | opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.zip opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.gz opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.bz2 opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/LightShare/LightShareModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs index f49641f..f524490 100644 --- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |||
| @@ -153,6 +153,9 @@ 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 (client == null) | ||
| 157 | return; | ||
| 158 | |||
| 156 | if (m_enableWindlight) | 159 | if (m_enableWindlight) |
| 157 | { | 160 | { |
| 158 | if (m_scene.RegionInfo.WindlightSettings.valid) | 161 | if (m_scene.RegionInfo.WindlightSettings.valid) |