diff options
author | UbitUmarov | 2017-05-07 04:21:33 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-07 04:21:33 +0100 |
commit | 11f6d28a0631d7bf96eed220dc58ab0824fb8f57 (patch) | |
tree | c2c08d0908e332983284299a6739c8bc0c136078 /OpenSim/Region/CoreModules/Avatar/Friends | |
parent | merge fix (diff) | |
parent | let StreamReader be in using statements (diff) | |
download | opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.zip opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.tar.gz opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.tar.bz2 opensim-SC-11f6d28a0631d7bf96eed220dc58ab0824fb8f57.tar.xz |
fix merge
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs index 81aa882..091b197 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | |||
@@ -65,9 +65,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
65 | protected override byte[] ProcessRequest( | 65 | protected override byte[] ProcessRequest( |
66 | string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 66 | string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
67 | { | 67 | { |
68 | StreamReader sr = new StreamReader(requestData); | 68 | string body; |
69 | string body = sr.ReadToEnd(); | 69 | using(StreamReader sr = new StreamReader(requestData)) |
70 | sr.Close(); | 70 | body = sr.ReadToEnd(); |
71 | |||
71 | body = body.Trim(); | 72 | body = body.Trim(); |
72 | 73 | ||
73 | //m_log.DebugFormat("[XXX]: query String: {0}", body); | 74 | //m_log.DebugFormat("[XXX]: query String: {0}", body); |