aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorMW2009-02-26 15:21:06 +0000
committerMW2009-02-26 15:21:06 +0000
commitde82bf9eb53cdd3be94b5a730b81c70d1e244b70 (patch)
tree82c00d621abfb853d7571e3889792704fa6424bf /OpenSim/Grid/UserServer
parentAdd check in SceneManager to stop opensim.exe crashing if no regions/scenes w... (diff)
downloadopensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.zip
opensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.tar.gz
opensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.tar.bz2
opensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.tar.xz
Added a PostInitialise method to IApplicationPlugin, this allows us to do work in there knowing that all other ApplicationPlugins have been initialised by that time.
Moved the loadRegions code in LoadRegionsPlugin to the PostInitialise method.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index dc38a3f..5a1dfd1 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -130,10 +130,10 @@ namespace OpenSim.Grid.UserServer
130 130
131 //Should be in modules? 131 //Should be in modules?
132 IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); 132 IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
133 // IRegionProfileService regionProfileService = new RegionProfileServiceProxy(); 133 // IRegionProfileRouter regionProfileService = new RegionProfileServiceProxy();
134 134
135 RegisterInterface<IInterServiceInventoryServices>(inventoryService); 135 RegisterInterface<IInterServiceInventoryServices>(inventoryService);
136 // RegisterInterface<IRegionProfileService>(regionProfileService); 136 // RegisterInterface<IRegionProfileRouter>(regionProfileService);
137 137
138 return inventoryService; 138 return inventoryService;
139 } 139 }