aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
diff options
context:
space:
mode:
authorubit2012-09-26 17:18:31 +0200
committerubit2012-09-26 17:18:31 +0200
commitb07b29c2475c3140601167277250d62ec03334a6 (patch)
tree9612b8640d89bdb9642f6fc2d5814fe5b7a87776 /OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentjust remove the damm thing (diff)
downloadopensim-SC-b07b29c2475c3140601167277250d62ec03334a6.zip
opensim-SC-b07b29c2475c3140601167277250d62ec03334a6.tar.gz
opensim-SC-b07b29c2475c3140601167277250d62ec03334a6.tar.bz2
opensim-SC-b07b29c2475c3140601167277250d62ec03334a6.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs18
1 files changed, 1 insertions, 17 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c379747..c09bf14 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -336,23 +336,7 @@ namespace OpenSim.Framework.Servers.HttpServer
336 { 336 {
337 if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id)) 337 if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
338 { 338 {
339 string strreq = ""; 339 Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
340 if (req.PollServiceArgs.GetEventsNeedsRequestBody)
341 {
342 try
343 {
344 // should we try to seek back? fear we can't
345 str = new StreamReader(req.Request.Body);
346 strreq = str.ReadToEnd();
347 str.Close();
348 }
349 catch
350 {
351 continue;
352 }
353 }
354
355 Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, strreq);
356 340
357 if (responsedata == null) 341 if (responsedata == null)
358 continue; 342 continue;