Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge

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
 
             m_log.Info("[RADMIN]: Dialog request started");
 
-            try
-            {
-                Hashtable requestData = (Hashtable)request.Params[0];
-
-                string message = (string)requestData["message"];
-                string fromuuid = (string)requestData["from"];
-                m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
+            Hashtable requestData = (Hashtable)request.Params[0];
 
-                responseData["accepted"] = true;
-                responseData["success"] = true;
+            string message = (string)requestData["message"];
+            string fromuuid = (string)requestData["from"];
+            m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
 
-                m_application.SceneManager.ForEachScene(
-                    delegate(Scene scene)
-                    {
-                        IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
-                        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());
+            responseData["accepted"] = true;
+            responseData["success"] = true;
 
-                responseData["accepted"] = false;
-                responseData["success"] = false;
-                responseData["error"] = e.Message;
-            }
+            m_application.SceneManager.ForEachScene(
+                delegate(Scene scene)
+                {
+                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
+                    if (dialogModule != null)
+                        dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
+                });
 
-            m_log.Info("[RADMIN]: Alert request complete");
+            m_log.Info("[RADMIN]: Dialog request complete");
         }
 
         private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)