diff options
| author | Melanie | 2011-03-21 07:57:56 +0000 |
|---|---|---|
| committer | Melanie | 2011-03-21 07:57:56 +0000 |
| commit | e4f143fb1c9ef13b024a1ebe8be41ebee6476cac (patch) | |
| tree | 967eb3af6fd0c5a55997d31bc86c05c7375b18d7 /OpenSim/Region/CoreModules/LightShare | |
| parent | Don't send a windlight profile to clients if windlight is not set for (diff) | |
| parent | Upgrade SQLite: (diff) | |
| download | opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.zip opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.gz opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.bz2 opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/LightShare')
| -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 40dd6c0..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 | { |
| @@ -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); |