diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/LightShare/LightShareModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs index 88f392d..2de8d7a 100644 --- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
75 | m_scene = scene; | 75 | m_scene = scene; |
76 | m_scene.RegisterModuleInterface<IRegionModule>(this); | 76 | m_scene.RegisterModuleInterface<IRegionModule>(this); |
77 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; | 77 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; |
78 | 78 | ||
79 | // ini file settings | 79 | // ini file settings |
80 | try | 80 | try |
81 | { | 81 | { |
@@ -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 | { |
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
229 | { | 229 | { |
230 | Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast"); | 230 | Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast"); |
231 | Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin"); | 231 | Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin"); |
232 | Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Enable the windlight plugin"); | 232 | Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Disable the windlight plugin"); |
233 | 233 | ||
234 | m_commander.RegisterCommand("load", wlload); | 234 | m_commander.RegisterCommand("load", wlload); |
235 | m_commander.RegisterCommand("enable", wlenable); | 235 | m_commander.RegisterCommand("enable", wlenable); |