aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation
diff options
context:
space:
mode:
authorMelanie2010-06-14 04:50:27 +0100
committerMelanie2010-06-14 04:50:27 +0100
commitc75b94f9f9afe3ad384f326db9d54e6bff3bde91 (patch)
treeea10bef43fd64e95048b953ac9bb65976911881a /OpenSim/Services/Connectors/Simulation
parentMerge branch 'master' into 0.7-post-fixes (diff)
parentFixes attachments coming back upon being detached in neighbouring regions and... (diff)
downloadopensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.zip
opensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.gz
opensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.bz2
opensim-SC_OLD-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.xz
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index ff0dd7e..32f02fb 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -479,7 +479,7 @@ namespace OpenSim.Services.Connectors.Simulation
479 } 479 }
480 catch (WebException ex) 480 catch (WebException ex)
481 { 481 {
482 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete {0}", ex.Message); 482 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message);
483 return false; 483 return false;
484 } 484 }
485 finally 485 finally