diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |
parent | more warnings to go. (diff) | |
download | opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index ae0b5ff..55ef047 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.DataSnapshot | |||
79 | 79 | ||
80 | //Program objects | 80 | //Program objects |
81 | private SnapshotStore m_snapStore = null; | 81 | private SnapshotStore m_snapStore = null; |
82 | private DataRequestHandler m_requests = null; | 82 | // private DataRequestHandler m_requests = null; |
83 | 83 | ||
84 | #endregion | 84 | #endregion |
85 | 85 | ||
@@ -144,7 +144,7 @@ namespace OpenSim.Region.DataSnapshot | |||
144 | m_passedCheck.Start(); | 144 | m_passedCheck.Start(); |
145 | 145 | ||
146 | //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer | 146 | //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer |
147 | m_requests = new DataRequestHandler(scene, this); | 147 | // m_requests = new DataRequestHandler(scene, this); |
148 | 148 | ||
149 | m_hostname = scene.RegionInfo.ExternalHostName; | 149 | m_hostname = scene.RegionInfo.ExternalHostName; |
150 | m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); | 150 | m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); |
@@ -325,17 +325,18 @@ namespace OpenSim.Region.DataSnapshot | |||
325 | m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString()); | 325 | m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString()); |
326 | } | 326 | } |
327 | byte[] response = new byte[1024]; | 327 | byte[] response = new byte[1024]; |
328 | int n = 0; | 328 | // int n = 0; |
329 | try | 329 | try |
330 | { | 330 | { |
331 | n = reply.Read(response, 0, 1024); | 331 | // n = reply.Read(response, 0, 1024); |
332 | reply.Read(response, 0, 1024); | ||
332 | } | 333 | } |
333 | catch (Exception e) | 334 | catch (Exception e) |
334 | { | 335 | { |
335 | m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace); | 336 | m_log.WarnFormat("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); |
336 | } | 337 | } |
337 | // This is not quite working, so... | 338 | // This is not quite working, so... |
338 | string responseStr = Encoding.UTF8.GetString(response); | 339 | // string responseStr = Encoding.UTF8.GetString(response); |
339 | m_log.Info("[DATASNAPSHOT] data service notified: " + url); | 340 | m_log.Info("[DATASNAPSHOT] data service notified: " + url); |
340 | } | 341 | } |
341 | 342 | ||