diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs index 0f2ba32..f9bc935 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | |||
@@ -119,14 +119,15 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
119 | 119 | ||
120 | Hashtable requestData = (Hashtable)req.Params[0]; | 120 | Hashtable requestData = (Hashtable)req.Params[0]; |
121 | 121 | ||
122 | if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey)) | 122 | // REFACTORING PROBLEM. This authorization needs to be replaced with some other |
123 | { | 123 | //if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey)) |
124 | responseData["accepted"] = false; | 124 | //{ |
125 | responseData["success"] = false; | 125 | // responseData["accepted"] = false; |
126 | responseData["error"] = "Invalid Key"; | 126 | // responseData["success"] = false; |
127 | response.Value = responseData; | 127 | // responseData["error"] = "Invalid Key"; |
128 | return response; | 128 | // response.Value = responseData; |
129 | } | 129 | // return response; |
130 | //} | ||
130 | 131 | ||
131 | string message = (string)requestData["message"]; | 132 | string message = (string)requestData["message"]; |
132 | string user = (string)requestData["user"]; | 133 | string user = (string)requestData["user"]; |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index cf7bcef..8cf4619 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -528,9 +528,9 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
528 | userProfile.PasswordHash = "$1$"; | 528 | userProfile.PasswordHash = "$1$"; |
529 | userProfile.PasswordSalt = ""; | 529 | userProfile.PasswordSalt = ""; |
530 | userProfile.SurName = agentData.lastname; | 530 | userProfile.SurName = agentData.lastname; |
531 | userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; | 531 | //userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; |
532 | userProfile.UserFlags = 0; | 532 | userProfile.UserFlags = 0; |
533 | userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL; | 533 | //userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL; |
534 | userProfile.WantDoMask = 0; | 534 | userProfile.WantDoMask = 0; |
535 | userProfile.WebLoginKey = UUID.Random(); | 535 | userProfile.WebLoginKey = UUID.Random(); |
536 | 536 | ||