Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
author: Melanie 2012-11-12 23:27:47 +0000
committer: Melanie 2012-11-12 23:27:47 +0000
commit: 2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc (patch)
tree: 308caeac8741ef507a3f02f41d4403a29d06b06e /OpenSim/ApplicationPlugins/RegionModulesController
parent: Merge branch 'master' into careminster (diff)
parent: Completely remove the IRegionModule interface (diff)
download: opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.zip
opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.gz
opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.bz2
opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.xz
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
            }
        }
-#region IRegionModulesController implementation
+#region Region Module interfacesController implementation
        
        /// <summary>
        /// Check that the given module is no disabled in the [Modules] section of the config files.
author	Melanie	2012-11-12 23:27:47 +0000
committer	Melanie	2012-11-12 23:27:47 +0000
commit	2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc (patch)
tree	308caeac8741ef507a3f02f41d4403a29d06b06e /OpenSim/ApplicationPlugins/RegionModulesController
parent	Merge branch 'master' into careminster (diff)
parent	Completely remove the IRegionModule interface (diff)
download	opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.zip opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.gz opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.bz2 opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.xz

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.