diff options
| author | Diva Canto | 2015-01-22 10:45:46 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-01-22 10:45:46 -0800 |
| commit | edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch) | |
| tree | 33ddce1499ec22dab20935148cacc24f9dc2031c /OpenSim/Framework | |
| parent | On the GridService, the central simulator features: ensure that the map tile ... (diff) | |
| parent | Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff) | |
| download | opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2 opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 6aa9479..caf0e98 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | |||
| @@ -72,7 +72,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 72 | } | 72 | } |
| 73 | catch (Exception ex) | 73 | catch (Exception ex) |
| 74 | { | 74 | { |
| 75 | m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex)); | 75 | m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex); |
| 76 | } | 76 | } |
| 77 | finally | 77 | finally |
| 78 | { | 78 | { |
| @@ -87,7 +87,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 87 | } | 87 | } |
| 88 | catch (Exception e) | 88 | catch (Exception e) |
| 89 | { | 89 | { |
| 90 | m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e)); | 90 | m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", e); |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | PollServiceArgs.RequestsHandled++; | 93 | PollServiceArgs.RequestsHandled++; |