Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

2 files changed, 18 insertions, 32 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 28635dd..c2822b6 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -36,8 +36,6 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Communications.OGS1;
 
 namespace OpenSim.Grid.UserServer
 {
@@ -50,8 +48,6 @@ namespace OpenSim.Grid.UserServer
         public UserManager m_userManager;
         public UserLoginService m_loginService;
 
-        public IInventoryServices m_inventoryService;
-
         LogBase m_console;
 
         [STAThread]
@@ -94,11 +90,7 @@ namespace OpenSim.Grid.UserServer
             m_userManager._config = Cfg;
             m_userManager.AddPlugin(Cfg.DatabaseProvider);
 
-            // prepare connection to the inventory server
-            m_inventoryService = new OGS1InventoryService(Cfg.InventoryServerName, Cfg.InventoryServerPort, null);
-
-            
-            m_loginService = new UserLoginService(m_userManager, m_inventoryService, Cfg, Cfg.DefaultStartupMsg);
+            m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
 
             MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
@@ -111,7 +103,6 @@ namespace OpenSim.Grid.UserServer
             httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod ));
             
             httpServer.Start();
-
             m_console.Status("SERVER", "Userserver 0.3 - Startup complete");
         }
 
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f0140a5..95192e3 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -6,7 +6,6 @@ using OpenSim.Framework.Data;
 using OpenSim.Framework.UserManagement;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Communications;
 
 namespace OpenSim.Grid.UserServer
 {
@@ -14,8 +13,8 @@ namespace OpenSim.Grid.UserServer
     {
         public UserConfig m_config;
 
-        public UserLoginService(UserManagerBase userManager, IInventoryServices inventoryServer, UserConfig config, string welcomeMess)
-            : base(userManager, inventoryServer, welcomeMess)
+        public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
+            : base(userManager, welcomeMess)
         {
             m_config = config;
         }
@@ -72,29 +71,25 @@ namespace OpenSim.Grid.UserServer
             theUser.currentAgent.currentHandle = SimInfo.regionHandle;
 
             System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
-            // Send
-            try
-            {
-                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
+            // Send

+            try

+            {

+                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);

+                XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);

             }
             catch( WebException e )
-            {
-                switch( e.Status )
-                {
-                    case WebExceptionStatus.Timeout:
-                        //TODO: Send him to nearby or default region instead
-                        break;
-                       
-                    default:
-                        throw;
-                }
+            {

+                switch( e.Status )

+                {

+                    case WebExceptionStatus.Timeout:

+                        //TODO: Send him to nearby or default region instead

+                        break;

+                       

+                    default:

+                        throw;

+                }

             }
         }
     }
 }
 
-
-
-
-