diff options
| author | Melanie | 2012-11-04 22:37:28 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-04 22:37:28 +0000 |
| commit | dd416298f1da71b801c789367a4408f5c2728df1 (patch) | |
| tree | 9aa8ed8419dd536fe2f326755ad3468289818ffc /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
| download | opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.zip opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.tar.gz opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.tar.bz2 opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs index 7429293..7688e0f 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | |||
| @@ -153,9 +153,9 @@ namespace OpenSim.Services.Connectors | |||
| 153 | } | 153 | } |
| 154 | catch (Exception e) | 154 | catch (Exception e) |
| 155 | { | 155 | { |
| 156 | m_log.WarnFormat( | 156 | // m_log.WarnFormat( |
| 157 | "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}", | 157 | // "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}", |
| 158 | thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace); | 158 | // thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace); |
| 159 | 159 | ||
| 160 | return false; | 160 | return false; |
| 161 | } | 161 | } |
| @@ -202,4 +202,4 @@ namespace OpenSim.Services.Connectors | |||
| 202 | return true; | 202 | return true; |
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | } \ No newline at end of file | 205 | } |