diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Serialiser')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs index ec97acd..0e861a1 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private Commander m_commander = new Commander("export"); | 49 | // private Commander m_commander = new Commander("export"); |
50 | private List<Scene> m_regions = new List<Scene>(); | 50 | private List<Scene> m_regions = new List<Scene>(); |
51 | private string m_savedir = "exports"; | 51 | private string m_savedir = "exports"; |
52 | private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>(); | 52 | private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>(); |
@@ -77,14 +77,13 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
77 | m_serialisers.Add(new SerialiseObjects()); | 77 | m_serialisers.Add(new SerialiseObjects()); |
78 | } | 78 | } |
79 | 79 | ||
80 | LoadCommanderCommands(); | 80 | // LoadCommanderCommands(); |
81 | } | 81 | } |
82 | 82 | ||
83 | |||
84 | public void AddRegion(Scene scene) | 83 | public void AddRegion(Scene scene) |
85 | { | 84 | { |
86 | scene.RegisterModuleCommander(m_commander); | 85 | // scene.RegisterModuleCommander(m_commander); |
87 | scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; | 86 | // scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; |
88 | scene.RegisterModuleInterface<IRegionSerialiserModule>(this); | 87 | scene.RegisterModuleInterface<IRegionSerialiserModule>(this); |
89 | 88 | ||
90 | lock (m_regions) | 89 | lock (m_regions) |
@@ -211,18 +210,18 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
211 | 210 | ||
212 | #endregion | 211 | #endregion |
213 | 212 | ||
214 | private void EventManager_OnPluginConsole(string[] args) | 213 | // private void EventManager_OnPluginConsole(string[] args) |
215 | { | 214 | // { |
216 | if (args[0] == "export") | 215 | // if (args[0] == "export") |
217 | { | 216 | // { |
218 | string[] tmpArgs = new string[args.Length - 2]; | 217 | // string[] tmpArgs = new string[args.Length - 2]; |
219 | int i = 0; | 218 | // int i = 0; |
220 | for (i = 2; i < args.Length; i++) | 219 | // for (i = 2; i < args.Length; i++) |
221 | tmpArgs[i - 2] = args[i]; | 220 | // tmpArgs[i - 2] = args[i]; |
222 | 221 | // | |
223 | m_commander.ProcessConsoleCommand(args[1], tmpArgs); | 222 | // m_commander.ProcessConsoleCommand(args[1], tmpArgs); |
224 | } | 223 | // } |
225 | } | 224 | // } |
226 | 225 | ||
227 | private void InterfaceSaveRegion(Object[] args) | 226 | private void InterfaceSaveRegion(Object[] args) |
228 | { | 227 | { |
@@ -245,15 +244,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
245 | } | 244 | } |
246 | } | 245 | } |
247 | 246 | ||
248 | private void LoadCommanderCommands() | 247 | // private void LoadCommanderCommands() |
249 | { | 248 | // { |
250 | Command serialiseSceneCommand = new Command("save", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveRegion, "Saves the named region into the exports directory."); | 249 | // Command serialiseSceneCommand = new Command("save", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveRegion, "Saves the named region into the exports directory."); |
251 | serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String"); | 250 | // serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String"); |
252 | 251 | // | |
253 | Command serialiseAllScenesCommand = new Command("save-all",CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveAllRegions, "Saves all regions into the exports directory."); | 252 | // Command serialiseAllScenesCommand = new Command("save-all",CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveAllRegions, "Saves all regions into the exports directory."); |
254 | 253 | // | |
255 | m_commander.RegisterCommand("save", serialiseSceneCommand); | 254 | // m_commander.RegisterCommand("save", serialiseSceneCommand); |
256 | m_commander.RegisterCommand("save-all", serialiseAllScenesCommand); | 255 | // m_commander.RegisterCommand("save-all", serialiseAllScenesCommand); |
257 | } | 256 | // } |
258 | } | 257 | } |
259 | } | 258 | } |