Merge branch 'master' of /home/git/repo/OpenSim

author: BlueWall 2011-04-13 09:53:44 -0400
committer: BlueWall 2011-04-13 09:53:44 -0400
commit: d3457eae7a33f01a8fa906c4040792cdc4a67857 (patch)
tree: f92e60733b8397576b86c486e05aa5219f27d034 /OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
parent: Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff)
parent: Move example HttpProxy setting to OpenSim.ini.example and tidy (diff)
download: opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.zip
opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.tar.gz
opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.tar.bz2
opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.tar.xz
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
        public void SendProfileToClient(ScenePresence presence)
        {
            IClientAPI client = presence.ControllingClient;
-            if (m_enableWindlight)
+            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
            {
                if (presence.IsChildAgent == false)
                {
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
        public void SendProfileToClient(ScenePresence presence, RegionLightShareData wl)
        {
            IClientAPI client = presence.ControllingClient;
-            if (m_enableWindlight)
+            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
            {
                if (presence.IsChildAgent == false)
                {
author	BlueWall	2011-04-13 09:53:44 -0400
committer	BlueWall	2011-04-13 09:53:44 -0400
commit	d3457eae7a33f01a8fa906c4040792cdc4a67857 (patch)
tree	f92e60733b8397576b86c486e05aa5219f27d034 /OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
parent	Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff)
parent	Move example HttpProxy setting to OpenSim.ini.example and tidy (diff)
download	opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.zip opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.tar.gz opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.tar.bz2 opensim-SC_OLD-d3457eae7a33f01a8fa906c4040792cdc4a67857.tar.xz

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	{