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