diff options
author | Justin Clarke Casey | 2009-06-01 16:00:46 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-06-01 16:00:46 +0000 |
commit | ecbeb5cea15e558b1df361dc90f1bf24bbc87152 (patch) | |
tree | 50dea4d3ea9b5ab3f71db0c03860de830c1674aa /OpenSim/ApplicationPlugins/RemoteController | |
parent | Fixed AvatarCreationModule (I think) (diff) | |
download | opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.zip opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.tar.gz opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.tar.bz2 opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.tar.xz |
* Fix race condition in save oar
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index c6c8b70..47240a1 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -311,8 +311,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
311 | } | 311 | } |
312 | catch (Exception e) | 312 | catch (Exception e) |
313 | { | 313 | { |
314 | m_log.ErrorFormat("[RADMIN] Terrain Loading: failed: {0}", e.Message); | 314 | m_log.ErrorFormat("[RADMIN]: Terrain Loading: failed: {0}", e.Message); |
315 | m_log.DebugFormat("[RADMIN] Terrain Loading: failed: {0}", e.ToString()); | 315 | m_log.DebugFormat("[RADMIN]: Terrain Loading: failed: {0}", e.ToString()); |
316 | 316 | ||
317 | responseData["success"] = false; | 317 | responseData["success"] = false; |
318 | responseData["error"] = e.Message; | 318 | responseData["error"] = e.Message; |
@@ -325,7 +325,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
325 | 325 | ||
326 | public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request, IPEndPoint remoteClient) | 326 | public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
327 | { | 327 | { |
328 | |||
329 | m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); | 328 | m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); |
330 | 329 | ||
331 | XmlRpcResponse response = new XmlRpcResponse(); | 330 | XmlRpcResponse response = new XmlRpcResponse(); |
@@ -759,7 +758,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
759 | /// <description>error message if success is false</description></item> | 758 | /// <description>error message if success is false</description></item> |
760 | /// </list> | 759 | /// </list> |
761 | /// </remarks> | 760 | /// </remarks> |
762 | |||
763 | public XmlRpcResponse XmlRpcModifyRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) | 761 | public XmlRpcResponse XmlRpcModifyRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
764 | { | 762 | { |
765 | m_log.Info("[RADMIN]: ModifyRegion: new request"); | 763 | m_log.Info("[RADMIN]: ModifyRegion: new request"); |