From 1e4842eabad7ccd1429161b98588220da1d8b657 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 8 Dec 2011 05:28:54 +0100 Subject: [PATCH] Remove superfluous try block --- .../RemoteController/RemoteAdminPlugin.cs | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9298726147..7a1956f67e 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -214,7 +214,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController { Hashtable requestData = (Hashtable) request.Params[0]; - m_log.Info("[RADMIN]: Request to restart Region."); CheckStringParameters(requestData, responseData, new string[] {"password"}); FailIfRemoteAdminNotAllowed((string)requestData["password"], responseData, remoteClient.Address.ToString()); @@ -358,36 +357,24 @@ namespace OpenSim.ApplicationPlugins.RemoteController m_log.Info("[RADMIN]: Dialog request started"); - try - { - Hashtable requestData = (Hashtable)request.Params[0]; + Hashtable requestData = (Hashtable)request.Params[0]; - string message = (string)requestData["message"]; - string fromuuid = (string)requestData["from"]; - m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message); + string message = (string)requestData["message"]; + string fromuuid = (string)requestData["from"]; + m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message); - responseData["accepted"] = true; - responseData["success"] = true; + responseData["accepted"] = true; + responseData["success"] = true; - m_application.SceneManager.ForEachScene( - delegate(Scene scene) - { - IDialogModule dialogModule = scene.RequestModuleInterface(); - if (dialogModule != null) - dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message); - }); - } - catch (Exception e) - { - m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message); - m_log.DebugFormat("[RADMIN]: Broadcasting: failed: {0}", e.ToString()); + m_application.SceneManager.ForEachScene( + delegate(Scene scene) + { + IDialogModule dialogModule = scene.RequestModuleInterface(); + if (dialogModule != null) + dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message); + }); - responseData["accepted"] = false; - responseData["success"] = false; - responseData["error"] = e.Message; - } - - m_log.Info("[RADMIN]: Alert request complete"); + m_log.Info("[RADMIN]: Dialog request complete"); } private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)