NetworkServersInfo removed from CommsManager.

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
 
             Hashtable requestData = (Hashtable)req.Params[0];
 
-            if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey))
-            {
-                responseData["accepted"] = false;
-                responseData["success"] = false;
-                responseData["error"] = "Invalid Key";
-                response.Value = responseData;
-                return response;
-            }
+            // REFACTORING PROBLEM. This authorization needs to be replaced with some other
+            //if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey))
+            //{
+            //    responseData["accepted"] = false;
+            //    responseData["success"] = false;
+            //    responseData["error"] = "Invalid Key";
+            //    response.Value = responseData;
+            //    return response;
+            //}
 
             string message = (string)requestData["message"];
             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
             userProfile.PasswordHash = "$1$";
             userProfile.PasswordSalt = "";
             userProfile.SurName = agentData.lastname;
-            userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL;
+            //userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL;
             userProfile.UserFlags = 0;
-            userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL;
+            //userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL;
             userProfile.WantDoMask = 0;
             userProfile.WebLoginKey = UUID.Random();