diff options
author | Homer Horwitz | 2009-04-05 17:08:11 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-04-05 17:08:11 +0000 |
commit | 648452dd91e07be4ec0e81793807e86bd48362c4 (patch) | |
tree | 4c1e7f1e48381fd9049efd5eda6440f885af86a4 /OpenSim/Region/Framework/Scenes | |
parent | - Move IWindModule to OpenSim.Region.Framework.Interfaces (diff) | |
download | opensim-SC_OLD-648452dd91e07be4ec0e81793807e86bd48362c4.zip opensim-SC_OLD-648452dd91e07be4ec0e81793807e86bd48362c4.tar.gz opensim-SC_OLD-648452dd91e07be4ec0e81793807e86bd48362c4.tar.bz2 opensim-SC_OLD-648452dd91e07be4ec0e81793807e86bd48362c4.tar.xz |
- Add new RegionModulesControllerPlugin to the application modules
- Change several classes to use the new plugin for handling of region-modules
(NOTE: No regionmodule is using this yet)
- Add necessary prebuild parts (don't forget to runprebuild)
Attention: Work in progress. This shouldn't break anything, but you never know...
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 65 |
1 files changed, 58 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 3695b21..42f3d97 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -59,13 +59,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
59 | } | 59 | } |
60 | protected Dictionary<string, IRegionModule> m_modules = new Dictionary<string, IRegionModule>(); | 60 | protected Dictionary<string, IRegionModule> m_modules = new Dictionary<string, IRegionModule>(); |
61 | 61 | ||
62 | public Dictionary<string, IRegionModuleBase> RegionModules | ||
63 | { | ||
64 | get { return m_regionModules; } | ||
65 | } | ||
66 | private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>(); | ||
67 | |||
62 | /// <value> | 68 | /// <value> |
63 | /// The module interfaces available from this scene. | 69 | /// The module interfaces available from this scene. |
64 | /// </value> | 70 | /// </value> |
65 | protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>(); | 71 | protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>(); |
66 | 72 | ||
67 | protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); | 73 | protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); |
68 | 74 | ||
69 | /// <value> | 75 | /// <value> |
70 | /// The module commanders available from this scene | 76 | /// The module commanders available from this scene |
71 | /// </value> | 77 | /// </value> |
@@ -235,7 +241,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
235 | } | 241 | } |
236 | } | 242 | } |
237 | Modules.Clear(); | 243 | Modules.Clear(); |
238 | 244 | ||
239 | try | 245 | try |
240 | { | 246 | { |
241 | EventManager.TriggerShutdown(); | 247 | EventManager.TriggerShutdown(); |
@@ -279,6 +285,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
279 | } | 285 | } |
280 | 286 | ||
281 | /// <summary> | 287 | /// <summary> |
288 | /// Add a region-module to this scene. TODO: This will replace AddModule in the future. | ||
289 | /// </summary> | ||
290 | /// <param name="name"></param> | ||
291 | /// <param name="module"></param> | ||
292 | public void AddRegionModule(string name, IRegionModuleBase module) | ||
293 | { | ||
294 | if (!RegionModules.ContainsKey(name)) | ||
295 | { | ||
296 | RegionModules.Add(name, module); | ||
297 | } | ||
298 | } | ||
299 | |||
300 | public void RemoveRegionModule(string name) | ||
301 | { | ||
302 | RegionModules.Remove(name); | ||
303 | } | ||
304 | |||
305 | /// <summary> | ||
282 | /// Register a module commander. | 306 | /// Register a module commander. |
283 | /// </summary> | 307 | /// </summary> |
284 | /// <param name="commander"></param> | 308 | /// <param name="commander"></param> |
@@ -368,6 +392,25 @@ namespace OpenSim.Region.Framework.Scenes | |||
368 | } | 392 | } |
369 | } | 393 | } |
370 | 394 | ||
395 | public void UnregisterModuleInterface<M>(M mod) | ||
396 | { | ||
397 | List<Object> l; | ||
398 | if (ModuleInterfaces.TryGetValue(typeof(M), out l)) | ||
399 | { | ||
400 | if (l.Remove(mod)) | ||
401 | { | ||
402 | if (mod is IEntityCreator) | ||
403 | { | ||
404 | IEntityCreator entityCreator = (IEntityCreator)mod; | ||
405 | foreach (PCode pcode in entityCreator.CreationCapabilities) | ||
406 | { | ||
407 | m_entityCreators[pcode] = null; | ||
408 | } | ||
409 | } | ||
410 | } | ||
411 | } | ||
412 | } | ||
413 | |||
371 | public void StackModuleInterface<M>(M mod) | 414 | public void StackModuleInterface<M>(M mod) |
372 | { | 415 | { |
373 | List<Object> l; | 416 | List<Object> l; |
@@ -462,11 +505,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
462 | 505 | ||
463 | if (mod != null) | 506 | if (mod != null) |
464 | { | 507 | { |
465 | if (!(mod is IRegionModule)) | 508 | if (mod is IRegionModule) |
466 | throw new Exception("AddCommand module parameter must be IRegionModule"); | 509 | { |
467 | IRegionModule module = (IRegionModule)mod; | 510 | IRegionModule module = (IRegionModule)mod; |
468 | modulename = module.Name; | 511 | modulename = module.Name; |
469 | shared = module.IsSharedModule; | 512 | shared = module.IsSharedModule; |
513 | } | ||
514 | else if (mod is IRegionModuleBase) | ||
515 | { | ||
516 | IRegionModuleBase module = (IRegionModuleBase)mod; | ||
517 | modulename = module.Name; | ||
518 | shared = mod is ISharedRegionModule; | ||
519 | } | ||
520 | else throw new Exception("AddCommand module parameter must be IRegionModule or IRegionModuleBase"); | ||
470 | } | 521 | } |
471 | 522 | ||
472 | MainConsole.Instance.Commands.AddCommand(modulename, shared, command, shorthelp, longhelp, callback); | 523 | MainConsole.Instance.Commands.AddCommand(modulename, shared, command, shorthelp, longhelp, callback); |