diff options
Diffstat (limited to 'OpenSim.Servers/LocalUserProfileManager.cs')
-rw-r--r-- | OpenSim.Servers/LocalUserProfileManager.cs | 13 |
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 | |||
45 | private string m_ipAddr; | 45 | private string m_ipAddr; |
46 | private uint regionX; | 46 | private uint regionX; |
47 | private uint regionY; | 47 | private uint regionY; |
48 | private AddNewSessionHandler AddSession; | ||
48 | 49 | ||
49 | public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY) | 50 | public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY) |
50 | { | 51 | { |
@@ -55,6 +56,11 @@ namespace OpenSim.UserServer | |||
55 | regionY = regY; | 56 | regionY = regY; |
56 | } | 57 | } |
57 | 58 | ||
59 | public void SetSessionHandler(AddNewSessionHandler sessionHandler) | ||
60 | { | ||
61 | this.AddSession = sessionHandler; | ||
62 | } | ||
63 | |||
58 | public override void InitUserProfiles() | 64 | public override void InitUserProfiles() |
59 | { | 65 | { |
60 | // TODO: need to load from database | 66 | // TODO: need to load from database |
@@ -100,15 +106,18 @@ namespace OpenSim.UserServer | |||
100 | _login.Agent = new LLUUID((string)response["agent_id"]) ; | 106 | _login.Agent = new LLUUID((string)response["agent_id"]) ; |
101 | _login.Session = new LLUUID((string)response["session_id"]); | 107 | _login.Session = new LLUUID((string)response["session_id"]); |
102 | _login.SecureSession = new LLUUID((string)response["secure_session_id"]); | 108 | _login.SecureSession = new LLUUID((string)response["secure_session_id"]); |
109 | _login.CircuitCode =(uint) circode; | ||
103 | _login.BaseFolder = null; | 110 | _login.BaseFolder = null; |
104 | _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]); | 111 | _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]); |
105 | 112 | ||
106 | //working on local computer if so lets add to the gridserver's list of sessions? | 113 | //working on local computer if so lets add to the gridserver's list of sessions? |
107 | if (m_gridServer.GetName() == "Local") | 114 | /*if (m_gridServer.GetName() == "Local") |
108 | { | 115 | { |
109 | Console.WriteLine("adding login data to gridserver"); | 116 | Console.WriteLine("adding login data to gridserver"); |
110 | ((LocalGridBase)this.m_gridServer).AddNewSession(_login); | 117 | ((LocalGridBase)this.m_gridServer).AddNewSession(_login); |
111 | } | 118 | }*/ |
119 | |||
120 | this.AddSession(_login); | ||
112 | } | 121 | } |
113 | } | 122 | } |
114 | } | 123 | } |