diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 91c284c..0473701 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -342,7 +342,7 @@ namespace OpenSim.Framework.UserManagement | |||
342 | UserAgentData agent = new UserAgentData(); | 342 | UserAgentData agent = new UserAgentData(); |
343 | 343 | ||
344 | // User connection | 344 | // User connection |
345 | agent.agentOnline = true; | 345 | agent.AgentOnline = true; |
346 | 346 | ||
347 | // Generate sessions | 347 | // Generate sessions |
348 | RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); | 348 | RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); |
@@ -351,15 +351,15 @@ namespace OpenSim.Framework.UserManagement | |||
351 | rand.GetBytes(randDataS); | 351 | rand.GetBytes(randDataS); |
352 | rand.GetBytes(randDataSS); | 352 | rand.GetBytes(randDataSS); |
353 | 353 | ||
354 | agent.secureSessionID = new LLUUID(randDataSS, 0); | 354 | agent.SecureSessionID = new LLUUID(randDataSS, 0); |
355 | agent.sessionID = new LLUUID(randDataS, 0); | 355 | agent.SessionID = new LLUUID(randDataS, 0); |
356 | 356 | ||
357 | // Profile UUID | 357 | // Profile UUID |
358 | agent.UUID = profile.ID; | 358 | agent.ProfileID = profile.ID; |
359 | 359 | ||
360 | // Current position (from Home) | 360 | // Current position (from Home) |
361 | agent.currentHandle = profile.HomeRegion; | 361 | agent.CurrentHandle = profile.HomeRegion; |
362 | agent.currentPos = profile.HomeLocation; | 362 | agent.CurrentPos = profile.HomeLocation; |
363 | 363 | ||
364 | // If user specified additional start, use that | 364 | // If user specified additional start, use that |
365 | if (requestData.ContainsKey("start")) | 365 | if (requestData.ContainsKey("start")) |
@@ -367,16 +367,16 @@ namespace OpenSim.Framework.UserManagement | |||
367 | string startLoc = ((string)requestData["start"]).Trim(); | 367 | string startLoc = ((string)requestData["start"]).Trim(); |
368 | if (("last" == startLoc) && (profile.CurrentAgent != null)) | 368 | if (("last" == startLoc) && (profile.CurrentAgent != null)) |
369 | { | 369 | { |
370 | if ((profile.CurrentAgent.currentPos.X > 0) | 370 | if ((profile.CurrentAgent.CurrentPos.X > 0) |
371 | && (profile.CurrentAgent.currentPos.Y > 0) | 371 | && (profile.CurrentAgent.CurrentPos.Y > 0) |
372 | && (profile.CurrentAgent.currentPos.Z > 0) | 372 | && (profile.CurrentAgent.CurrentPos.Z > 0) |
373 | ) | 373 | ) |
374 | { | 374 | { |
375 | // TODO: Right now, currentRegion has not been used in GridServer for requesting region. | 375 | // TODO: Right now, currentRegion has not been used in GridServer for requesting region. |
376 | // TODO: It is only using currentHandle. | 376 | // TODO: It is only using currentHandle. |
377 | agent.currentRegion = profile.CurrentAgent.currentRegion; | 377 | agent.CurrentRegion = profile.CurrentAgent.CurrentRegion; |
378 | agent.currentHandle = profile.CurrentAgent.currentHandle; | 378 | agent.CurrentHandle = profile.CurrentAgent.CurrentHandle; |
379 | agent.currentPos = profile.CurrentAgent.currentPos; | 379 | agent.CurrentPos = profile.CurrentAgent.CurrentPos; |
380 | } | 380 | } |
381 | } | 381 | } |
382 | 382 | ||
@@ -399,12 +399,12 @@ namespace OpenSim.Framework.UserManagement | |||
399 | } | 399 | } |
400 | 400 | ||
401 | // What time did the user login? | 401 | // What time did the user login? |
402 | agent.loginTime = Util.UnixTimeSinceEpoch(); | 402 | agent.LoginTime = Util.UnixTimeSinceEpoch(); |
403 | agent.logoutTime = 0; | 403 | agent.LogoutTime = 0; |
404 | 404 | ||
405 | // Current location | 405 | // Current location |
406 | agent.regionID = LLUUID.Zero; // Fill in later | 406 | agent.RegionID = LLUUID.Zero; // Fill in later |
407 | agent.currentRegion = LLUUID.Zero; // Fill in later | 407 | agent.CurrentRegion = LLUUID.Zero; // Fill in later |
408 | 408 | ||
409 | profile.CurrentAgent = agent; | 409 | profile.CurrentAgent = agent; |
410 | } | 410 | } |
@@ -437,16 +437,16 @@ namespace OpenSim.Framework.UserManagement | |||
437 | userAgent = userProfile.CurrentAgent; | 437 | userAgent = userProfile.CurrentAgent; |
438 | if (userAgent != null) | 438 | if (userAgent != null) |
439 | { | 439 | { |
440 | userAgent.agentOnline = false; | 440 | userAgent.AgentOnline = false; |
441 | userAgent.logoutTime = Util.UnixTimeSinceEpoch(); | 441 | userAgent.LogoutTime = Util.UnixTimeSinceEpoch(); |
442 | //userAgent.sessionID = LLUUID.Zero; | 442 | //userAgent.sessionID = LLUUID.Zero; |
443 | if (regionid != LLUUID.Zero) | 443 | if (regionid != LLUUID.Zero) |
444 | { | 444 | { |
445 | userAgent.currentRegion = regionid; | 445 | userAgent.CurrentRegion = regionid; |
446 | } | 446 | } |
447 | 447 | ||
448 | userAgent.currentHandle = regionhandle; | 448 | userAgent.CurrentHandle = regionhandle; |
449 | userAgent.currentPos = currentPos; | 449 | userAgent.CurrentPos = currentPos; |
450 | userProfile.CurrentAgent = userAgent; | 450 | userProfile.CurrentAgent = userAgent; |
451 | 451 | ||
452 | CommitAgent(ref userProfile); | 452 | CommitAgent(ref userProfile); |
@@ -468,7 +468,7 @@ namespace OpenSim.Framework.UserManagement | |||
468 | UserAgentData agent = new UserAgentData(); | 468 | UserAgentData agent = new UserAgentData(); |
469 | 469 | ||
470 | // User connection | 470 | // User connection |
471 | agent.agentOnline = true; | 471 | agent.AgentOnline = true; |
472 | 472 | ||
473 | // Generate sessions | 473 | // Generate sessions |
474 | RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); | 474 | RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); |
@@ -477,23 +477,23 @@ namespace OpenSim.Framework.UserManagement | |||
477 | rand.GetBytes(randDataS); | 477 | rand.GetBytes(randDataS); |
478 | rand.GetBytes(randDataSS); | 478 | rand.GetBytes(randDataSS); |
479 | 479 | ||
480 | agent.secureSessionID = new LLUUID(randDataSS, 0); | 480 | agent.SecureSessionID = new LLUUID(randDataSS, 0); |
481 | agent.sessionID = new LLUUID(randDataS, 0); | 481 | agent.SessionID = new LLUUID(randDataS, 0); |
482 | 482 | ||
483 | // Profile UUID | 483 | // Profile UUID |
484 | agent.UUID = profile.ID; | 484 | agent.ProfileID = profile.ID; |
485 | 485 | ||
486 | // Current position (from Home) | 486 | // Current position (from Home) |
487 | agent.currentHandle = profile.HomeRegion; | 487 | agent.CurrentHandle = profile.HomeRegion; |
488 | agent.currentPos = profile.HomeLocation; | 488 | agent.CurrentPos = profile.HomeLocation; |
489 | 489 | ||
490 | // What time did the user login? | 490 | // What time did the user login? |
491 | agent.loginTime = Util.UnixTimeSinceEpoch(); | 491 | agent.LoginTime = Util.UnixTimeSinceEpoch(); |
492 | agent.logoutTime = 0; | 492 | agent.LogoutTime = 0; |
493 | 493 | ||
494 | // Current location | 494 | // Current location |
495 | agent.regionID = LLUUID.Zero; // Fill in later | 495 | agent.RegionID = LLUUID.Zero; // Fill in later |
496 | agent.currentRegion = LLUUID.Zero; // Fill in later | 496 | agent.CurrentRegion = LLUUID.Zero; // Fill in later |
497 | 497 | ||
498 | profile.CurrentAgent = agent; | 498 | profile.CurrentAgent = agent; |
499 | } | 499 | } |