diff options
author | Sean Dague | 2008-04-10 14:37:17 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-10 14:37:17 +0000 |
commit | ef7dfae41c728d10cfe835cb256958c354449f1b (patch) | |
tree | 98affd8fd75500ece10eb471ba405709e2d389f4 /OpenSim/Framework/Communications/LoginService.cs | |
parent | further renaming of properties for clarity (diff) | |
download | opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.zip opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.tar.gz opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.tar.bz2 opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.tar.xz |
changing UserAgentData to use properties. This caused more
grief than expected, as monodevelop doesn't like to refactor
properties of properties.
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 4f314bc..afe7359 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -184,13 +184,13 @@ namespace OpenSim.Framework.UserManagement | |||
184 | else | 184 | else |
185 | { | 185 | { |
186 | // If we already have a session... | 186 | // If we already have a session... |
187 | if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.agentOnline) | 187 | if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.AgentOnline) |
188 | { | 188 | { |
189 | //TODO: The following statements can cause trouble: | 189 | //TODO: The following statements can cause trouble: |
190 | // If agentOnline could not turn from true back to false normally | 190 | // If agentOnline could not turn from true back to false normally |
191 | // because of some problem, for instance, the crashment of server or client, | 191 | // because of some problem, for instance, the crashment of server or client, |
192 | // the user cannot log in any longer. | 192 | // the user cannot log in any longer. |
193 | userProfile.CurrentAgent.agentOnline = false; | 193 | userProfile.CurrentAgent.AgentOnline = false; |
194 | m_userManager.CommitAgent(ref userProfile); | 194 | m_userManager.CommitAgent(ref userProfile); |
195 | 195 | ||
196 | // Reject the login | 196 | // Reject the login |
@@ -225,8 +225,8 @@ namespace OpenSim.Framework.UserManagement | |||
225 | logResponse.Lastname = userProfile.SurName; | 225 | logResponse.Lastname = userProfile.SurName; |
226 | logResponse.Firstname = userProfile.FirstName; | 226 | logResponse.Firstname = userProfile.FirstName; |
227 | logResponse.AgentID = agentID.ToString(); | 227 | logResponse.AgentID = agentID.ToString(); |
228 | logResponse.SessionID = userProfile.CurrentAgent.sessionID.ToString(); | 228 | logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString(); |
229 | logResponse.SecureSessionID = userProfile.CurrentAgent.secureSessionID.ToString(); | 229 | logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString(); |
230 | logResponse.InventoryRoot = InventoryRoot; | 230 | logResponse.InventoryRoot = InventoryRoot; |
231 | logResponse.InventorySkeleton = AgentInventoryArray; | 231 | logResponse.InventorySkeleton = AgentInventoryArray; |
232 | logResponse.InventoryLibrary = GetInventoryLibrary(); | 232 | logResponse.InventoryLibrary = GetInventoryLibrary(); |
@@ -334,7 +334,7 @@ namespace OpenSim.Framework.UserManagement | |||
334 | else | 334 | else |
335 | { | 335 | { |
336 | // If we already have a session... | 336 | // If we already have a session... |
337 | if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.agentOnline) | 337 | if (userProfile.CurrentAgent != null && userProfile.CurrentAgent.AgentOnline) |
338 | { | 338 | { |
339 | userProfile.CurrentAgent = null; | 339 | userProfile.CurrentAgent = null; |
340 | m_userManager.CommitAgent(ref userProfile); | 340 | m_userManager.CommitAgent(ref userProfile); |
@@ -367,8 +367,8 @@ namespace OpenSim.Framework.UserManagement | |||
367 | logResponse.Lastname = userProfile.SurName; | 367 | logResponse.Lastname = userProfile.SurName; |
368 | logResponse.Firstname = userProfile.FirstName; | 368 | logResponse.Firstname = userProfile.FirstName; |
369 | logResponse.AgentID = agentID.ToString(); | 369 | logResponse.AgentID = agentID.ToString(); |
370 | logResponse.SessionID = userProfile.CurrentAgent.sessionID.ToString(); | 370 | logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString(); |
371 | logResponse.SecureSessionID = userProfile.CurrentAgent.secureSessionID.ToString(); | 371 | logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString(); |
372 | logResponse.InventoryRoot = InventoryRoot; | 372 | logResponse.InventoryRoot = InventoryRoot; |
373 | logResponse.InventorySkeleton = AgentInventoryArray; | 373 | logResponse.InventorySkeleton = AgentInventoryArray; |
374 | logResponse.InventoryLibrary = GetInventoryLibrary(); | 374 | logResponse.InventoryLibrary = GetInventoryLibrary(); |