OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

avinationmerge
Melanie 2011-12-08 18:30:09 +00:00
parent 96539ffc79 3217bccfcd
commit 3b991a2222
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -357,8 +357,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
m_log.Info("[RADMIN]: Dialog request started"); 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 message = (string)requestData["message"];
@ -375,18 +373,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (dialogModule != null) if (dialogModule != null)
dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message); 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"] = false; m_log.Info("[RADMIN]: Dialog request complete");
responseData["success"] = false;
responseData["error"] = e.Message;
}
m_log.Info("[RADMIN]: Alert request complete");
} }
private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)