diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs index 0f2ba32..b7d3904 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | |||
@@ -46,7 +46,6 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | private readonly List<Scene> m_scenes = new List<Scene>(); | 48 | private readonly List<Scene> m_scenes = new List<Scene>(); |
49 | private CommunicationsManager m_com; | ||
50 | private IConfigSource m_settings; | 49 | private IConfigSource m_settings; |
51 | 50 | ||
52 | #region Implementation of IRegionModuleBase | 51 | #region Implementation of IRegionModuleBase |
@@ -88,7 +87,6 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
88 | { | 87 | { |
89 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) | 88 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) |
90 | { | 89 | { |
91 | m_com = m_scenes[0].CommsManager; | ||
92 | MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage); | 90 | MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage); |
93 | } | 91 | } |
94 | } | 92 | } |
@@ -119,14 +117,15 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
119 | 117 | ||
120 | Hashtable requestData = (Hashtable)req.Params[0]; | 118 | Hashtable requestData = (Hashtable)req.Params[0]; |
121 | 119 | ||
122 | if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey)) | 120 | // REFACTORING PROBLEM. This authorization needs to be replaced with some other |
123 | { | 121 | //if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey)) |
124 | responseData["accepted"] = false; | 122 | //{ |
125 | responseData["success"] = false; | 123 | // responseData["accepted"] = false; |
126 | responseData["error"] = "Invalid Key"; | 124 | // responseData["success"] = false; |
127 | response.Value = responseData; | 125 | // responseData["error"] = "Invalid Key"; |
128 | return response; | 126 | // response.Value = responseData; |
129 | } | 127 | // return response; |
128 | //} | ||
130 | 129 | ||
131 | string message = (string)requestData["message"]; | 130 | string message = (string)requestData["message"]; |
132 | string user = (string)requestData["user"]; | 131 | string user = (string)requestData["user"]; |