aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/Framework/IGridServiceCore.cs (renamed from OpenSim/Grid/Framework/IUGAIMCore.cs)80
-rw-r--r--OpenSim/Grid/Framework/IGridServiceModule.cs2
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs4
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridRestModule.cs4
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs2
-rw-r--r--OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs4
-rw-r--r--OpenSim/Grid/MessagingServer.Modules/MessageService.cs4
-rw-r--r--OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs4
-rw-r--r--OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs4
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs4
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserManager.cs2
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs2
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs3
-rw-r--r--OpenSim/Grid/UserServer/UserServerCommandModule.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs2
19 files changed, 69 insertions, 68 deletions
diff --git a/OpenSim/Grid/Framework/IUGAIMCore.cs b/OpenSim/Grid/Framework/IGridServiceCore.cs
index 46fde8c..894ea14 100644
--- a/OpenSim/Grid/Framework/IUGAIMCore.cs
+++ b/OpenSim/Grid/Framework/IGridServiceCore.cs
@@ -1,40 +1,40 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework.Servers; 29using OpenSim.Framework.Servers;
30 30
31namespace OpenSim.Grid.Framework 31namespace OpenSim.Grid.Framework
32{ 32{
33 public interface IUGAIMCore 33 public interface IGridServiceCore
34 { 34 {
35 T Get<T>(); 35 T Get<T>();
36 void RegisterInterface<T>(T iface); 36 void RegisterInterface<T>(T iface);
37 bool TryGet<T>(out T iface); 37 bool TryGet<T>(out T iface);
38 BaseHttpServer GetHttpServer(); 38 BaseHttpServer GetHttpServer();
39 } 39 }
40} 40}
diff --git a/OpenSim/Grid/Framework/IGridServiceModule.cs b/OpenSim/Grid/Framework/IGridServiceModule.cs
index 6891beb..b44bd40 100644
--- a/OpenSim/Grid/Framework/IGridServiceModule.cs
+++ b/OpenSim/Grid/Framework/IGridServiceModule.cs
@@ -6,7 +6,7 @@ namespace OpenSim.Grid.Framework
6 public interface IGridServiceModule 6 public interface IGridServiceModule
7 { 7 {
8 void Close(); 8 void Close();
9 void Initialise(IUGAIMCore core); 9 void Initialise(IGridServiceCore core);
10 void PostInitialise(); 10 void PostInitialise();
11 void RegisterHandlers(BaseHttpServer httpServer); 11 void RegisterHandlers(BaseHttpServer httpServer);
12 } 12 }
diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
index 1d2c529..c3b722c 100644
--- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.GridServer.Modules
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 protected GridDBService m_gridDBService; 45 protected GridDBService m_gridDBService;
46 protected IUGAIMCore m_gridCore; 46 protected IGridServiceCore m_gridCore;
47 47
48 protected GridConfig m_config; 48 protected GridConfig m_config;
49 49
@@ -61,7 +61,7 @@ namespace OpenSim.Grid.GridServer.Modules
61 { 61 {
62 } 62 }
63 63
64 public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) 64 public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
65 { 65 {
66 m_opensimVersion = opensimVersion; 66 m_opensimVersion = opensimVersion;
67 m_gridDBService = gridDBService; 67 m_gridDBService = gridDBService;
diff --git a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs
index 716f923..95fa706 100644
--- a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Grid.GridServer.Modules
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 private GridDBService m_gridDBService; 48 private GridDBService m_gridDBService;
49 private IUGAIMCore m_gridCore; 49 private IGridServiceCore m_gridCore;
50 50
51 protected GridConfig m_config; 51 protected GridConfig m_config;
52 52
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.GridServer.Modules
67 { 67 {
68 } 68 }
69 69
70 public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) 70 public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
71 { 71 {
72 m_opensimVersion = opensimVersion; 72 m_opensimVersion = opensimVersion;
73 m_gridDBService = gridDBService; 73 m_gridDBService = gridDBService;
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
index 62101e5..2f51443 100644
--- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Grid.GridServer.Modules
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private GridDBService m_gridDBService; 49 private GridDBService m_gridDBService;
50 private IUGAIMCore m_gridCore; 50 private IGridServiceCore m_gridCore;
51 51
52 protected GridConfig m_config; 52 protected GridConfig m_config;
53 53
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules
69 { 69 {
70 } 70 }
71 71
72 public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) 72 public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
73 { 73 {
74 m_opensimVersion = opensimVersion; 74 m_opensimVersion = opensimVersion;
75 m_gridDBService = gridDBService; 75 m_gridDBService = gridDBService;
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 54a9443..1bc3955 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.GridServer
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// </summary> 43 /// </summary>
44 public class GridServerBase : BaseOpenSimServer, IUGAIMCore 44 public class GridServerBase : BaseOpenSimServer, IGridServiceCore
45 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
index 7002a2e..b751d37 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
@@ -50,12 +50,12 @@ namespace OpenSim.Grid.MessagingServer.Modules
50 50
51 private IMessageUserServerService m_userServerModule; 51 private IMessageUserServerService m_userServerModule;
52 52
53 private IUGAIMCore m_messageCore; 53 private IGridServiceCore m_messageCore;
54 54
55 // a dictionary of all current regions this server knows about 55 // a dictionary of all current regions this server knows about
56 private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>(); 56 private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();
57 57
58 public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore) 58 public MessageRegionModule(MessageServerConfig config, IGridServiceCore messageCore)
59 { 59 {
60 m_cfg = config; 60 m_cfg = config;
61 m_messageCore = messageCore; 61 m_messageCore = messageCore;
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index e79e5b4..0a37bb5 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
49 private MessageServerConfig m_cfg; 49 private MessageServerConfig m_cfg;
50 private UserDataBaseService m_userDataBaseService; 50 private UserDataBaseService m_userDataBaseService;
51 51
52 private IUGAIMCore m_messageCore; 52 private IGridServiceCore m_messageCore;
53 53
54 private IMessageUserServerService m_userServerModule; 54 private IMessageUserServerService m_userServerModule;
55 private IMessageRegionLookup m_regionModule; 55 private IMessageRegionLookup m_regionModule;
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
57 // a dictionary of all current presences this server knows about 57 // a dictionary of all current presences this server knows about
58 private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>(); 58 private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>();
59 59
60 public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService) 60 public MessageService(MessageServerConfig cfg, IGridServiceCore messageCore, UserDataBaseService userDataBaseService)
61 { 61 {
62 m_cfg = cfg; 62 m_cfg = cfg;
63 m_messageCore = messageCore; 63 m_messageCore = messageCore;
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs
index e153c39..f4d5792 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs
@@ -48,11 +48,11 @@ namespace OpenSim.Grid.MessagingServer.Modules
48 48
49 private MessageServerConfig m_cfg; 49 private MessageServerConfig m_cfg;
50 50
51 private IUGAIMCore m_messageCore; 51 private IGridServiceCore m_messageCore;
52 52
53 private Timer reconnectTimer = new Timer(300000); // 5 mins 53 private Timer reconnectTimer = new Timer(300000); // 5 mins
54 54
55 public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore) 55 public MessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore)
56 { 56 {
57 m_cfg = config; 57 m_cfg = config;
58 m_messageCore = messageCore; 58 m_messageCore = messageCore;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 53c5e28..2893528 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.MessagingServer
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// </summary> 43 /// </summary>
44 public class OpenMessage_Main : BaseOpenSimServer , IUGAIMCore 44 public class OpenMessage_Main : BaseOpenSimServer , IGridServiceCore
45 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
diff --git a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs
index a6fdee0..e79e786 100644
--- a/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/GridInfoServiceModule.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.UserServer.Modules
43{ 43{
44 public class GridInfoServiceModule 44 public class GridInfoServiceModule
45 { 45 {
46 protected IUGAIMCore m_core; 46 protected IGridServiceCore m_core;
47 protected GridInfoService m_gridInfoService; 47 protected GridInfoService m_gridInfoService;
48 protected BaseHttpServer m_httpServer; 48 protected BaseHttpServer m_httpServer;
49 49
@@ -51,7 +51,7 @@ namespace OpenSim.Grid.UserServer.Modules
51 { 51 {
52 } 52 }
53 53
54 public void Initialise(IUGAIMCore core) 54 public void Initialise(IGridServiceCore core)
55 { 55 {
56 m_core = core; 56 m_core = core;
57 m_gridInfoService = new GridInfoService(); 57 m_gridInfoService = new GridInfoService();
diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
index 5b245ee..f9e7889 100644
--- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Grid.UserServer.Modules
79 79
80 Thread m_NotifyThread; 80 Thread m_NotifyThread;
81 81
82 private IUGAIMCore m_core; 82 private IGridServiceCore m_core;
83 83
84 public event AgentLocationDelegate OnAgentLocation; 84 public event AgentLocationDelegate OnAgentLocation;
85 public event AgentLeavingDelegate OnAgentLeaving; 85 public event AgentLeavingDelegate OnAgentLeaving;
@@ -91,7 +91,7 @@ namespace OpenSim.Grid.UserServer.Modules
91 MessageServers = new Dictionary<string, MessageServerInfo>(); 91 MessageServers = new Dictionary<string, MessageServerInfo>();
92 } 92 }
93 93
94 public void Initialise(IUGAIMCore core) 94 public void Initialise(IGridServiceCore core)
95 { 95 {
96 m_core = core; 96 m_core = core;
97 m_core.RegisterInterface<MessageServersConnector>(this); 97 m_core.RegisterInterface<MessageServersConnector>(this);
diff --git a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
index 80f2f7b..485dd46 100644
--- a/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserDataBaseService.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules
41{ 41{
42 public class UserDataBaseService : UserManagerBase 42 public class UserDataBaseService : UserManagerBase
43 { 43 {
44 protected IUGAIMCore m_core; 44 protected IGridServiceCore m_core;
45 45
46 public UserDataBaseService() 46 public UserDataBaseService()
47 : base(null) 47 : base(null)
@@ -53,7 +53,7 @@ namespace OpenSim.Grid.UserServer.Modules
53 { 53 {
54 } 54 }
55 55
56 public void Initialise(IUGAIMCore core) 56 public void Initialise(IGridServiceCore core)
57 { 57 {
58 m_core = core; 58 m_core = core;
59 59
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index 34daff2..c40201e 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Grid.UserServer.Modules
60 m_userDataBaseService = userDataBaseService; 60 m_userDataBaseService = userDataBaseService;
61 } 61 }
62 62
63 public void Initialise(IUGAIMCore core) 63 public void Initialise(IGridServiceCore core)
64 { 64 {
65 65
66 } 66 }
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
index e68752d..a5a630e 100644
--- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Grid.UserServer.Modules
51 m_userDataBaseService = userDataBaseService; 51 m_userDataBaseService = userDataBaseService;
52 } 52 }
53 53
54 public void Initialise(IUGAIMCore core) 54 public void Initialise(IGridServiceCore core)
55 { 55 {
56 56
57 } 57 }
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
index 6c1daea..49e94ee 100644
--- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.UserServer.Modules
52 m_userDataBaseService = userDataBaseService; 52 m_userDataBaseService = userDataBaseService;
53 } 53 }
54 54
55 public void Initialise(IUGAIMCore core) 55 public void Initialise(IGridServiceCore core)
56 { 56 {
57 57
58 } 58 }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 63d788d..dc38a3f 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.UserServer
48 /// <summary> 48 /// <summary>
49 /// Grid user server main class 49 /// Grid user server main class
50 /// </summary> 50 /// </summary>
51 public class OpenUser_Main : BaseOpenSimServer, IUGAIMCore 51 public class OpenUser_Main : BaseOpenSimServer, IGridServiceCore
52 { 52 {
53 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 53 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54 54
@@ -128,6 +128,7 @@ namespace OpenSim.Grid.UserServer
128 RegisterInterface<ConsoleBase>(m_console); 128 RegisterInterface<ConsoleBase>(m_console);
129 RegisterInterface<UserConfig>(Cfg); 129 RegisterInterface<UserConfig>(Cfg);
130 130
131 //Should be in modules?
131 IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); 132 IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
132 // IRegionProfileService regionProfileService = new RegionProfileServiceProxy(); 133 // IRegionProfileService regionProfileService = new RegionProfileServiceProxy();
133 134
diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
index a6f8af2..7f7108c 100644
--- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
@@ -57,13 +57,13 @@ namespace OpenSim.Grid.UserServer
57 57
58 protected UUID m_lastCreatedUser = UUID.Random(); 58 protected UUID m_lastCreatedUser = UUID.Random();
59 59
60 protected IUGAIMCore m_core; 60 protected IGridServiceCore m_core;
61 61
62 public UserServerCommandModule() 62 public UserServerCommandModule()
63 { 63 {
64 } 64 }
65 65
66 public void Initialise(IUGAIMCore core) 66 public void Initialise(IGridServiceCore core)
67 { 67 {
68 m_core = core; 68 m_core = core;
69 } 69 }
diff --git a/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs b/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs
index e23a7d1..2d3f414 100644
--- a/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs
+++ b/OpenSim/Grid/UserServer/UserServerEventDispatchModule.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Grid.UserServer
60 m_loginService = loginService; 60 m_loginService = loginService;
61 } 61 }
62 62
63 public void Initialise(IUGAIMCore core) 63 public void Initialise(IGridServiceCore core)
64 { 64 {
65 } 65 }
66 66