diff options
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index 49bd911..633d005 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | |||
| @@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
| 215 | } | 215 | } |
| 216 | } | 216 | } |
| 217 | 217 | ||
| 218 | #region IRegionModulesController implementation | 218 | #region Region Module interfacesController implementation |
| 219 | 219 | ||
| 220 | /// <summary> | 220 | /// <summary> |
| 221 | /// Check that the given module is no disabled in the [Modules] section of the config files. | 221 | /// Check that the given module is no disabled in the [Modules] section of the config files. |