Merge branch 'justincc-master'

This commit is contained in:
Justin Clark-Casey (justincc)
2014-01-31 00:51:22 +00:00
7 changed files with 171 additions and 152 deletions

View File

@@ -1030,7 +1030,7 @@ namespace OpenSim.Framework
finally
{
if (requestStream != null)
requestStream.Close();
requestStream.Dispose();
// capture how much time was spent writing
tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -1183,7 +1183,7 @@ namespace OpenSim.Framework
finally
{
if (requestStream != null)
requestStream.Close();
requestStream.Dispose();
// capture how much time was spent writing
tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -1268,4 +1268,4 @@ namespace OpenSim.Framework
return deserial;
}
}
}
}