diff options
author | Melanie | 2011-05-20 22:38:05 +0100 |
---|---|---|
committer | Melanie | 2011-05-20 22:38:05 +0100 |
commit | e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9 (patch) | |
tree | 746085bf27044b477fc4552228b14388565421ec /OpenSim/Framework | |
parent | If a response cannot be obtained (the script has no handler) return a more fr... (diff) | |
parent | Implement llGetLinKNumberOfSides(). (diff) | |
download | opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.zip opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.gz opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.bz2 opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index f8691dc..f176485 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -974,7 +974,7 @@ namespace OpenSim.Framework | |||
974 | } | 974 | } |
975 | catch (Exception e) | 975 | catch (Exception e) |
976 | { | 976 | { |
977 | m_log.WarnFormat("[SynchronousRestObjectRequester]: exception in sending data to {0}: {1}", requestUrl, e); | 977 | m_log.DebugFormat("[SynchronousRestObjectRequester]: exception in sending data to {0}: {1}", requestUrl, e); |
978 | return deserial; | 978 | return deserial; |
979 | } | 979 | } |
980 | finally | 980 | finally |
@@ -999,18 +999,18 @@ namespace OpenSim.Framework | |||
999 | respStream.Close(); | 999 | respStream.Close(); |
1000 | } | 1000 | } |
1001 | else | 1001 | else |
1002 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb); | 1002 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb); |
1003 | 1003 | ||
1004 | } | 1004 | } |
1005 | } | 1005 | } |
1006 | catch (System.InvalidOperationException) | 1006 | catch (System.InvalidOperationException) |
1007 | { | 1007 | { |
1008 | // This is what happens when there is invalid XML | 1008 | // This is what happens when there is invalid XML |
1009 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); | 1009 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); |
1010 | } | 1010 | } |
1011 | catch (Exception e) | 1011 | catch (Exception e) |
1012 | { | 1012 | { |
1013 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e); | 1013 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e); |
1014 | } | 1014 | } |
1015 | 1015 | ||
1016 | return deserial; | 1016 | return deserial; |