Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

1 files changed, 2 insertions, 8 deletions

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 07de27a..eabb62d 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -232,9 +232,8 @@ namespace OpenSim.Framework.Console
 
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
-            m_Server.AddPollServiceHTTPHandler(uri, HandleHttpPoll,
-                    new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents,
-                    sessionID));
+            m_Server.AddPollServiceHTTPHandler(
+                uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID));
 
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -266,11 +265,6 @@ namespace OpenSim.Framework.Console
             return reply;
         }
 
-        private Hashtable HandleHttpPoll(Hashtable request)
-        {
-            return new Hashtable();
-        }
-
         private Hashtable HandleHttpCloseSession(Hashtable request)
         {
             DoExpire();