diff options
author | Melanie | 2012-11-12 22:50:28 +0000 |
---|---|---|
committer | Melanie | 2012-11-12 22:50:28 +0000 |
commit | 8c130bcaf5a60fa042d8df38ba1d1e1cb328d768 (patch) | |
tree | c96ae7dcf06cf6f6b4efba25bb0a37e55c053fce /OpenSim/Region/Application/OpenSim.cs | |
parent | Remove IRegionModule support from the test setup helper (diff) | |
download | opensim-SC-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.zip opensim-SC-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.tar.gz opensim-SC-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.tar.bz2 opensim-SC-8c130bcaf5a60fa042d8df38ba1d1e1cb328d768.tar.xz |
Remove the old style module loader and all references to it
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 2236e43..47252f6 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -757,33 +757,13 @@ namespace OpenSim | |||
757 | switch (cmdparams[0].ToLower()) | 757 | switch (cmdparams[0].ToLower()) |
758 | { | 758 | { |
759 | case "list": | 759 | case "list": |
760 | foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules) | 760 | //TODO: Convert to new region modules |
761 | { | ||
762 | MainConsole.Instance.Output(String.Format("Shared region module: {0}", irm.Name)); | ||
763 | } | ||
764 | break; | 761 | break; |
765 | case "unload": | 762 | case "unload": |
766 | if (cmdparams.Length > 1) | 763 | //TODO: Convert to new region modules |
767 | { | ||
768 | foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules)) | ||
769 | { | ||
770 | if (rm.Name.ToLower() == cmdparams[1].ToLower()) | ||
771 | { | ||
772 | MainConsole.Instance.Output(String.Format("Unloading module: {0}", rm.Name)); | ||
773 | m_moduleLoader.UnloadModule(rm); | ||
774 | } | ||
775 | } | ||
776 | } | ||
777 | break; | 764 | break; |
778 | case "load": | 765 | case "load": |
779 | if (cmdparams.Length > 1) | 766 | //TODO: Convert to new region modules |
780 | { | ||
781 | foreach (Scene s in new ArrayList(SceneManager.Scenes)) | ||
782 | { | ||
783 | MainConsole.Instance.Output(String.Format("Loading module: {0}", cmdparams[1])); | ||
784 | m_moduleLoader.LoadRegionModules(cmdparams[1], s); | ||
785 | } | ||
786 | } | ||
787 | break; | 767 | break; |
788 | } | 768 | } |
789 | } | 769 | } |
@@ -1018,28 +998,9 @@ namespace OpenSim | |||
1018 | break; | 998 | break; |
1019 | 999 | ||
1020 | case "modules": | 1000 | case "modules": |
1021 | MainConsole.Instance.Output("The currently loaded shared modules are:"); | ||
1022 | foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) | ||
1023 | { | ||
1024 | MainConsole.Instance.Output("Shared Module: " + module.Name); | ||
1025 | } | ||
1026 | |||
1027 | SceneManager.ForEachScene( | ||
1028 | delegate(Scene scene) { | ||
1029 | m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:"); | ||
1030 | foreach (IRegionModule module in scene.Modules.Values) | ||
1031 | { | ||
1032 | if (!module.IsSharedModule) | ||
1033 | { | ||
1034 | m_log.Error("Region Module: " + module.Name); | ||
1035 | } | ||
1036 | } | ||
1037 | } | ||
1038 | ); | ||
1039 | |||
1040 | SceneManager.ForEachScene( | 1001 | SceneManager.ForEachScene( |
1041 | delegate(Scene scene) { | 1002 | delegate(Scene scene) { |
1042 | MainConsole.Instance.Output("Loaded new region modules in" + scene.RegionInfo.RegionName + " are:"); | 1003 | MainConsole.Instance.Output("Loaded region modules in" + scene.RegionInfo.RegionName + " are:"); |
1043 | foreach (IRegionModuleBase module in scene.RegionModules.Values) | 1004 | foreach (IRegionModuleBase module in scene.RegionModules.Values) |
1044 | { | 1005 | { |
1045 | Type type = module.GetType().GetInterface("ISharedRegionModule"); | 1006 | Type type = module.GetType().GetInterface("ISharedRegionModule"); |