diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid')
| -rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 10a3232..cf7bcef 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
| @@ -534,26 +534,28 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
| 534 | userProfile.WantDoMask = 0; | 534 | userProfile.WantDoMask = 0; |
| 535 | userProfile.WebLoginKey = UUID.Random(); | 535 | userProfile.WebLoginKey = UUID.Random(); |
| 536 | 536 | ||
| 537 | // Do caps registration | 537 | // !!! REFACTORING PROBLEM. This needs to be changed for 0.7 |
| 538 | // get seed capagentData.firstname = FirstName;agentData.lastname = LastName; | 538 | // |
| 539 | if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode) | 539 | //// Do caps registration |
| 540 | { | 540 | //// get seed capagentData.firstname = FirstName;agentData.lastname = LastName; |
| 541 | homeScene.CommsManager.UserAdminService.AddUser( | 541 | //if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode) |
| 542 | agentData.firstname, agentData.lastname, CreateRandomStr(7), "", | 542 | //{ |
| 543 | homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID); | 543 | // homeScene.CommsManager.UserAdminService.AddUser( |
| 544 | // agentData.firstname, agentData.lastname, CreateRandomStr(7), "", | ||
| 545 | // homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID); | ||
| 544 | 546 | ||
| 545 | UserProfileData userProfile2 = homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID); | 547 | // UserProfileData userProfile2 = homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID); |
| 546 | if (userProfile2 != null) | 548 | // if (userProfile2 != null) |
| 547 | { | 549 | // { |
| 548 | userProfile = userProfile2; | 550 | // userProfile = userProfile2; |
| 549 | userProfile.AboutText = "OGP USER"; | 551 | // userProfile.AboutText = "OGP USER"; |
| 550 | userProfile.FirstLifeAboutText = "OGP USER"; | 552 | // userProfile.FirstLifeAboutText = "OGP USER"; |
| 551 | homeScene.CommsManager.UserService.UpdateUserProfile(userProfile); | 553 | // homeScene.CommsManager.UserService.UpdateUserProfile(userProfile); |
| 552 | } | 554 | // } |
| 553 | } | 555 | //} |
| 554 | 556 | ||
| 555 | // Stick our data in the cache so the region will know something about us | 557 | //// Stick our data in the cache so the region will know something about us |
| 556 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile); | 558 | //homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile); |
| 557 | 559 | ||
| 558 | // Call 'new user' event handler | 560 | // Call 'new user' event handler |
| 559 | string reason; | 561 | string reason; |