aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs41
1 files changed, 14 insertions, 27 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 9298726..7a1956f 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -214,7 +214,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
214 { 214 {
215 Hashtable requestData = (Hashtable) request.Params[0]; 215 Hashtable requestData = (Hashtable) request.Params[0];
216 216
217 m_log.Info("[RADMIN]: Request to restart Region.");
218 CheckStringParameters(requestData, responseData, new string[] {"password"}); 217 CheckStringParameters(requestData, responseData, new string[] {"password"});
219 218
220 FailIfRemoteAdminNotAllowed((string)requestData["password"], responseData, remoteClient.Address.ToString()); 219 FailIfRemoteAdminNotAllowed((string)requestData["password"], responseData, remoteClient.Address.ToString());
@@ -358,36 +357,24 @@ namespace OpenSim.ApplicationPlugins.RemoteController
358 357
359 m_log.Info("[RADMIN]: Dialog request started"); 358 m_log.Info("[RADMIN]: Dialog request started");
360 359
361 try 360 Hashtable requestData = (Hashtable)request.Params[0];
362 {
363 Hashtable requestData = (Hashtable)request.Params[0];
364
365 string message = (string)requestData["message"];
366 string fromuuid = (string)requestData["from"];
367 m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
368 361
369 responseData["accepted"] = true; 362 string message = (string)requestData["message"];
370 responseData["success"] = true; 363 string fromuuid = (string)requestData["from"];
364 m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
371 365
372 m_application.SceneManager.ForEachScene( 366 responseData["accepted"] = true;
373 delegate(Scene scene) 367 responseData["success"] = true;
374 {
375 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
376 if (dialogModule != null)
377 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
378 });
379 }
380 catch (Exception e)
381 {
382 m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message);
383 m_log.DebugFormat("[RADMIN]: Broadcasting: failed: {0}", e.ToString());
384 368
385 responseData["accepted"] = false; 369 m_application.SceneManager.ForEachScene(
386 responseData["success"] = false; 370 delegate(Scene scene)
387 responseData["error"] = e.Message; 371 {
388 } 372 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
373 if (dialogModule != null)
374 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
375 });
389 376
390 m_log.Info("[RADMIN]: Alert request complete"); 377 m_log.Info("[RADMIN]: Dialog request complete");
391 } 378 }
392 379
393 private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) 380 private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)