diff options
| author | Melanie | 2009-12-07 14:14:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-07 14:14:00 +0000 |
| commit | 9155c9ee3742ff3d79554779b32a8fe1b19aaaf3 (patch) | |
| tree | 23fd52b8cd3bd0e1caafa52dc393111cd762e93a /OpenSim/Region | |
| parent | Merge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminster (diff) | |
| parent | Stop AuthorizationService from throwing an error if it's not configured. (diff) | |
| download | opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.zip opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.gz opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.bz2 opensim-SC-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 62500a2..c727cec 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
| @@ -527,7 +527,6 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
| 527 | userProfile.Partner = UUID.Zero; | 527 | userProfile.Partner = UUID.Zero; |
| 528 | userProfile.PasswordHash = "$1$"; | 528 | userProfile.PasswordHash = "$1$"; |
| 529 | userProfile.PasswordSalt = ""; | 529 | userProfile.PasswordSalt = ""; |
| 530 | userProfile.RootInventoryFolderID = UUID.Zero; | ||
| 531 | userProfile.SurName = agentData.lastname; | 530 | userProfile.SurName = agentData.lastname; |
| 532 | userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; | 531 | userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; |
| 533 | userProfile.UserFlags = 0; | 532 | userProfile.UserFlags = 0; |