diff options
author | Justin Clarke Casey | 2009-04-22 22:19:43 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-22 22:19:43 +0000 |
commit | 342126b7b9ca386f9160daecb51ecc14487a5f9f (patch) | |
tree | a485a50aebead411fa2f38528b4c0b7ba19e91db /OpenSim/Grid/UserServer/Main.cs | |
parent | * Resolve http://opensimulator.org/mantis/view.php?id=3509 by passing up the ... (diff) | |
download | opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.zip opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.tar.gz opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.tar.bz2 opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.tar.xz |
* Resolve http://opensimulator.org/mantis/view.php?id=3509 by putting some service initialization into CommsManager
* What is really needed is a plugin and interface request system as being done for region modules
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index c0cba4a..0a5abd3 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -145,9 +145,16 @@ namespace OpenSim.Grid.UserServer | |||
145 | /// <param name="inventoryService"></param> | 145 | /// <param name="inventoryService"></param> |
146 | protected virtual void StartupUserServerModules() | 146 | protected virtual void StartupUserServerModules() |
147 | { | 147 | { |
148 | m_log.Info("[STARTUP]: Establishing data connection"); | 148 | m_log.Info("[STARTUP]: Establishing data connection"); |
149 | |||
150 | //we only need core components so we can request them from here | ||
151 | IInterServiceInventoryServices inventoryService; | ||
152 | TryGet<IInterServiceInventoryServices>(out inventoryService); | ||
153 | |||
154 | CommunicationsManager commsManager = new UserServerCommsManager(inventoryService); | ||
155 | |||
149 | //setup database access service, for now this has to be created before the other modules. | 156 | //setup database access service, for now this has to be created before the other modules. |
150 | m_userDataBaseService = new UserDataBaseService(); | 157 | m_userDataBaseService = new UserDataBaseService(commsManager); |
151 | m_userDataBaseService.Initialise(this); | 158 | m_userDataBaseService.Initialise(this); |
152 | 159 | ||
153 | //TODO: change these modules so they fetch the databaseService class in the PostInitialise method | 160 | //TODO: change these modules so they fetch the databaseService class in the PostInitialise method |