Quite big change to how Sessions/circuits are Authenticated. Seems to work okay but needs a lot more testing.

1 files changed, 11 insertions, 2 deletions

diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/OpenSim.Servers/LocalUserProfileManager.cs
index 2a119c5..a8b5f1f 100644
--- a/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/OpenSim.Servers/LocalUserProfileManager.cs
@@ -45,6 +45,7 @@ namespace OpenSim.UserServer
         private string m_ipAddr;

         private uint regionX;

         private uint regionY;

+        private AddNewSessionHandler AddSession;

 

         public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY)

                 {

@@ -55,6 +56,11 @@ namespace OpenSim.UserServer
             regionY = regY;

                 }

 

+        public void SetSessionHandler(AddNewSessionHandler sessionHandler)

+        {

+            this.AddSession = sessionHandler;

+        }

+

         public override void InitUserProfiles()

         {

             // TODO: need to load from database

@@ -100,15 +106,18 @@ namespace OpenSim.UserServer
             _login.Agent = new LLUUID((string)response["agent_id"]) ;

             _login.Session = new LLUUID((string)response["session_id"]);

             _login.SecureSession = new LLUUID((string)response["secure_session_id"]);

+            _login.CircuitCode =(uint) circode;

             _login.BaseFolder = null;

             _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]);

 

             //working on local computer if so lets add to the gridserver's list of sessions?

-            if (m_gridServer.GetName() == "Local")

+            /*if (m_gridServer.GetName() == "Local")

             {

                 Console.WriteLine("adding login data to gridserver");

                 ((LocalGridBase)this.m_gridServer).AddNewSession(_login);

-            }

+            }*/

+

+            this.AddSession(_login);

         }

     }

 }