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/Framework/WebUtil.cs | |
| 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_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC_OLD-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
| -rw-r--r-- | OpenSim/Framework/WebUtil.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index bcf6af8..54a6c0c 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -1030,7 +1030,7 @@ namespace OpenSim.Framework | |||
| 1030 | finally | 1030 | finally |
| 1031 | { | 1031 | { |
| 1032 | if (requestStream != null) | 1032 | if (requestStream != null) |
| 1033 | requestStream.Close(); | 1033 | requestStream.Dispose(); |
| 1034 | 1034 | ||
| 1035 | // capture how much time was spent writing | 1035 | // capture how much time was spent writing |
| 1036 | tickdata = Util.EnvironmentTickCountSubtract(tickstart); | 1036 | tickdata = Util.EnvironmentTickCountSubtract(tickstart); |
| @@ -1183,7 +1183,7 @@ namespace OpenSim.Framework | |||
| 1183 | finally | 1183 | finally |
| 1184 | { | 1184 | { |
| 1185 | if (requestStream != null) | 1185 | if (requestStream != null) |
| 1186 | requestStream.Close(); | 1186 | requestStream.Dispose(); |
| 1187 | 1187 | ||
| 1188 | // capture how much time was spent writing | 1188 | // capture how much time was spent writing |
| 1189 | tickdata = Util.EnvironmentTickCountSubtract(tickstart); | 1189 | tickdata = Util.EnvironmentTickCountSubtract(tickstart); |
| @@ -1268,4 +1268,4 @@ namespace OpenSim.Framework | |||
| 1268 | return deserial; | 1268 | return deserial; |
| 1269 | } | 1269 | } |
| 1270 | } | 1270 | } |
| 1271 | } \ No newline at end of file | 1271 | } |