diff options
| author | Melanie | 2010-06-14 02:49:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-14 02:49:15 +0100 |
| commit | fdf648bcf3cecc2236cc6761d33f3df5e0af136d (patch) | |
| tree | db65a301f98b6b998a901cdd887fec755e6d73dd /OpenSim/Services/Connectors/Simulation | |
| parent | D.U.H. #2. Inverted test. Again. Argh! (diff) | |
| parent | Fixes attachments coming back upon being detached in neighbouring regions and... (diff) | |
| download | opensim-SC_OLD-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.zip opensim-SC_OLD-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.gz opensim-SC_OLD-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.bz2 opensim-SC_OLD-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 748faef..0947b5f 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -483,7 +483,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 483 | } | 483 | } |
| 484 | catch (WebException ex) | 484 | catch (WebException ex) |
| 485 | { | 485 | { |
| 486 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete {0}", ex.Message); | 486 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message); |
| 487 | return false; | 487 | return false; |
| 488 | } | 488 | } |
| 489 | finally | 489 | finally |