aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer.Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-22 22:19:43 +0000
committerJustin Clarke Casey2009-04-22 22:19:43 +0000
commit342126b7b9ca386f9160daecb51ecc14487a5f9f (patch)
treea485a50aebead411fa2f38528b4c0b7ba19e91db /OpenSim/Grid/UserServer.Modules
parent* Resolve http://opensimulator.org/mantis/view.php?id=3509 by passing up the ... (diff)
downloadopensim-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 'OpenSim/Grid/UserServer.Modules')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs16
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
index 485dd46..51f9708 100644
--- a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
@@ -43,13 +43,8 @@ namespace OpenSim.Grid.UserServer.Modules
43 { 43 {
44 protected IGridServiceCore m_core; 44 protected IGridServiceCore m_core;
45 45
46 public UserDataBaseService() 46 public UserDataBaseService(CommunicationsManager commsManager)
47 : base(null) 47 : base(commsManager)
48 {
49 }
50
51 public UserDataBaseService(IInterServiceInventoryServices interServiceInventoryService)
52 : base(interServiceInventoryService)
53 { 48 {
54 } 49 }
55 50
@@ -57,13 +52,6 @@ namespace OpenSim.Grid.UserServer.Modules
57 { 52 {
58 m_core = core; 53 m_core = core;
59 54
60 //we only need core components so we can request them from here
61 IInterServiceInventoryServices inventoryService;
62 if (m_core.TryGet<IInterServiceInventoryServices>(out inventoryService))
63 {
64 m_interServiceInventoryService = inventoryService;
65 }
66
67 UserConfig cfg; 55 UserConfig cfg;
68 if (m_core.TryGet<UserConfig>(out cfg)) 56 if (m_core.TryGet<UserConfig>(out cfg))
69 { 57 {