Renamed IUGAIMCore to IGridServiceCore, still not really happy with this name as it could be confused with the Grid Server namespace or with the IGridService in the region servers.

3 files changed, 5 insertions, 4 deletions

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
     /// <summary>
     /// Grid user server main class
     /// </summary>
-    public class OpenUser_Main : BaseOpenSimServer, IUGAIMCore
+    public class OpenUser_Main : BaseOpenSimServer, IGridServiceCore
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -128,6 +128,7 @@ namespace OpenSim.Grid.UserServer
             RegisterInterface<ConsoleBase>(m_console);
             RegisterInterface<UserConfig>(Cfg);
 
+            //Should be in modules?
             IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
             // IRegionProfileService regionProfileService = new RegionProfileServiceProxy();
 
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
 
         protected UUID m_lastCreatedUser = UUID.Random();
 
-        protected IUGAIMCore m_core;
+        protected IGridServiceCore m_core;
 
         public UserServerCommandModule()
         {
         }
 
-        public void Initialise(IUGAIMCore core)
+        public void Initialise(IGridServiceCore core)
         {
             m_core = core;
         }
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
             m_loginService = loginService;

         }

 

-        public void Initialise(IUGAIMCore core)

+        public void Initialise(IGridServiceCore core)

         {

         }