aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-17 01:00:23 +0100
committerJustin Clark-Casey (justincc)2010-07-17 01:00:23 +0100
commit4ae04dd0a8de4d3597ef96d951f5573fedc4e847 (patch)
treec8256f08c46dab4134e87b9bc14f5dc413aaa719
parentBug in 0.6.9 sometimes restoring script state causes region console to crash ... (diff)
downloadopensim-SC_OLD-4ae04dd0a8de4d3597ef96d951f5573fedc4e847.zip
opensim-SC_OLD-4ae04dd0a8de4d3597ef96d951f5573fedc4e847.tar.gz
opensim-SC_OLD-4ae04dd0a8de4d3597ef96d951f5573fedc4e847.tar.bz2
opensim-SC_OLD-4ae04dd0a8de4d3597ef96d951f5573fedc4e847.tar.xz
extend exception catching for DoCreateChildAgentCall() from just WebException to Exception on feedback from Chris Hart.
See http://opensimulator.org/mantis/view.php?id=4810
-rw-r--r--OpenSim/Framework/Communications/Clients/RegionClient.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index ee7dec8..a5d4ce5 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -164,9 +164,9 @@ namespace OpenSim.Framework.Communications.Clients
164 } 164 }
165 } 165 }
166 } 166 }
167 catch (WebException ex) 167 catch (Exception ex)
168 { 168 {
169 m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", ex.Message); 169 m_log.DebugFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", ex.Message);
170 // ignore, really 170 // ignore, really
171 } 171 }
172 finally 172 finally
@@ -176,7 +176,6 @@ namespace OpenSim.Framework.Communications.Clients
176 } 176 }
177 177
178 return true; 178 return true;
179
180 } 179 }
181 180
182 public bool DoChildAgentUpdateCall(GridRegion region, IAgentData cAgentData) 181 public bool DoChildAgentUpdateCall(GridRegion region, IAgentData cAgentData)