diff options
| author | Melanie | 2014-02-04 01:55:41 +0000 |
|---|---|---|
| committer | Melanie | 2014-02-04 01:55:41 +0000 |
| commit | e1d1c279651784d7290241b8c4b416bc4c96ab3c (patch) | |
| tree | 0a6f258ff2612b0faaf6aceadaa7be09b1f0386e /OpenSim/Services/Connectors | |
| parent | Dropping the rest of Avination's modified appearance code for core. (diff) | |
| parent | Add "--no-objects" parameter to 'load oar'. (diff) | |
| download | opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs index beead97..0f8033d 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | |||
| @@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors | |||
| 162 | finally | 162 | finally |
| 163 | { | 163 | { |
| 164 | if (os != null) | 164 | if (os != null) |
| 165 | os.Close(); | 165 | os.Dispose(); |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | // Let's wait for the response | 168 | // Let's wait for the response |
| @@ -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 | } |