diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Grid/UserServer/Main.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
| -rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index a92226d..286076d7 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
| @@ -187,13 +187,13 @@ namespace OpenSim.Grid.UserServer | |||
| 187 | /// <param name="inventoryService"></param> | 187 | /// <param name="inventoryService"></param> |
| 188 | protected virtual void StartupUserServerModules() | 188 | protected virtual void StartupUserServerModules() |
| 189 | { | 189 | { |
| 190 | m_log.Info("[STARTUP]: Establishing data connection"); | 190 | m_log.Info("[STARTUP]: Establishing data connection"); |
| 191 | 191 | ||
| 192 | //we only need core components so we can request them from here | 192 | //we only need core components so we can request them from here |
| 193 | IInterServiceInventoryServices inventoryService; | 193 | IInterServiceInventoryServices inventoryService; |
| 194 | TryGet<IInterServiceInventoryServices>(out inventoryService); | 194 | TryGet<IInterServiceInventoryServices>(out inventoryService); |
| 195 | 195 | ||
| 196 | CommunicationsManager commsManager = new UserServerCommsManager(inventoryService); | 196 | CommunicationsManager commsManager = new UserServerCommsManager(inventoryService); |
| 197 | 197 | ||
| 198 | //setup database access service, for now this has to be created before the other modules. | 198 | //setup database access service, for now this has to be created before the other modules. |
| 199 | m_userDataBaseService = new UserDataBaseService(commsManager); | 199 | m_userDataBaseService = new UserDataBaseService(commsManager); |