Some very Preliminary work on .net remoting for interregion comms.

a few more classes for CAPS LLSD types.

7 files changed, 6 insertions, 23 deletions

diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 378a09c..e1465d1 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -8,7 +8,6 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;

 using OpenSim.Assets;

 using libsecondlife;

-using OpenSim.UserServer;

 using OpenSim.Servers;

 using OpenSim.Framework;

 using OpenSim.Caches;

@@ -32,10 +31,10 @@ namespace SimpleApp
 

             string simAddr = "127.0.0.1";

             int simPort = 9000;

-            

+            /*

             LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );

             loginServer.Startup();

-            loginServer.SetSessionHandler( AddNewSessionHandler );

+            loginServer.SetSessionHandler( AddNewSessionHandler );*/

 

             m_circuitManager = new AuthenticateSessionsBase();

 

@@ -64,7 +63,7 @@ namespace SimpleApp
             // world.PhysicsScene = physicsScene;

             // udpServer.LocalWorld = world;

 

-            httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );

+          //  httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );

             httpServer.Start();

             

             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");

diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs
index 27d4828..13a351d 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/OpenSim.Region/Caps.cs
@@ -17,7 +17,6 @@ namespace OpenSim.Region
 

     public class Caps

     {

-

         private string httpListenerAddress;

         private uint httpListenPort;

         private string capsObjectPath = "00001-";

diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index ffec3e5..45d3fed 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Scenes
 

             m_regionInfo = reginfo;

             m_regionHandle = reginfo.RegionHandle;

-            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Avatar.cs - Loading details from grid (DUMMY)");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");

             ControllingClient = theClient;

             this.firstname = ControllingClient.FirstName;

             this.lastname = ControllingClient.LastName;

@@ -216,8 +216,7 @@ namespace OpenSim.Region.Scenes
         /// </summary>

         /// <param name="pack"></param>

         public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)

-        {

-            

+        {  

             if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)

             {

                 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);

diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
index fd16e93..68a140b 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
@@ -41,7 +41,6 @@ using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework;

-using OpenSim.UserServer;

 using OpenSim.Assets;

 using OpenSim.Caches;

 using OpenSim.Framework.Console;

diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 002e664..f2a02d9 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -40,7 +40,6 @@ using libsecondlife.Packets;
 using OpenSim.Terrain;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using OpenSim.UserServer;

 using OpenSim.Assets;

 using OpenSim.Caches;

 using OpenSim.Framework.Console;

diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 7254560..40701b0 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -28,7 +28,6 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.UserServer;

 using OpenSim.Framework.Console;

 

 namespace OpenSim

diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index a6ad15d..7da2263 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -44,7 +44,6 @@ using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework;

-using OpenSim.UserServer;

 using OpenSim.Assets;

 using OpenSim.Caches;

 using OpenSim.Framework.Console;

@@ -129,21 +128,11 @@ namespace OpenSim
 

             m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server");

 

-            //Login server setup

-            LoginServer loginServer = null;

-            LoginServer adminLoginServer = null;

+

 

             if (m_sandbox)

             {

                 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);

-               

-                /*

-                loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);

-                loginServer.Startup();

-                loginServer.SetSessionHandler(sandboxCommunications.SandBoxServices.AddNewSession);

-                //sandbox mode with loginserver not using accounts

-                httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);

-                 */

             }

 

             //Start http server