Merge branch 'justincc-master'

2026-08-12 12:25:42 +08:00 · 2014-01-31 00:51:22 +00:00
parent c467dfcd81 b8e22f02e7
commit b2878eb773
7 changed files with 171 additions and 152 deletions
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors
            finally
            {
                if (os != null)
-                    os.Close();
+                    os.Dispose();
            }

            // Let's wait for the response
@@ -202,4 +202,4 @@ namespace OpenSim.Services.Connectors
            return true;
        }
    }
-}
+}