aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-07-17 03:09:27 +0100
committerMelanie2010-07-17 03:09:27 +0100
commit6f591376dd22c05d297dec6e5fe0d78e47a7d0ff (patch)
tree52ba1d530eef192274471b212afe1fdec7715cb8 /OpenSim/Framework
parentMerge branch '0.6.9-post-fixes' into careminster (diff)
parentStop occasional permanently high 100% utilization when the server is started ... (diff)
downloadopensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.zip
opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.tar.gz
opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.tar.bz2
opensim-SC-6f591376dd22c05d297dec6e5fe0d78e47a7d0ff.tar.xz
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
-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)