Convergence is almost complete. This brings the diff between the API to < 10k

and makes it use a common set of types in both engine. Fixes the issues with
running both engines and HTTP requests / listens / timers etc..
Also fixes a couple of minor Scene issues and a CTB by nullref.

1 files changed, 0 insertions, 98 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
deleted file mode 100644
index 5b4cb83..0000000
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
-using OpenSim.Region.ScriptEngine.Shared;
-
-namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
-{
-    public class HttpRequest
-    {
-        public AsyncCommandManager m_CmdManager;
-
-        public HttpRequest(AsyncCommandManager CmdManager)
-        {
-            m_CmdManager = CmdManager;
-        }
-
-        public void CheckHttpRequests()
-        {
-            if (m_CmdManager.m_ScriptEngine.World == null)
-                return;
-
-            IHttpRequests iHttpReq =
-                m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>();
-
-            HttpRequestClass httpInfo = null;
-
-            if (iHttpReq != null)
-                httpInfo = iHttpReq.GetNextCompletedRequest();
-
-            while (httpInfo != null)
-            {
-                //m_ScriptEngine.Log.Info("[AsyncLSL]:" + httpInfo.response_body + httpInfo.status);
-
-                // Deliver data to prim's remote_data handler
-                //
-                // TODO: Returning null for metadata, since the lsl function
-                // only returns the byte for HTTP_BODY_TRUNCATED, which is not
-                // implemented here yet anyway.  Should be fixed if/when maxsize
-                // is supported
-
-                bool handled = false;
-                iHttpReq.RemoveCompletedRequest(httpInfo.reqID);
-                foreach (ScriptEngine sman in ScriptEngine.ScriptEngines)
-                {
-                    if (sman.m_ScriptManager.GetScript(httpInfo.localID, httpInfo.itemID) != null)
-                    {
-                        object[] resobj = new object[]
-                        {
-                            new LSL_Types.LSLString(httpInfo.reqID.ToString()), new LSL_Types.LSLInteger(httpInfo.status), null, new LSL_Types.LSLString(httpInfo.response_body)
-                        };
-
-                        sman.m_EventQueueManager.AddToScriptQueue(
-                            httpInfo.localID, httpInfo.itemID, "http_response", EventQueueManager.llDetectNull, resobj
-                        );
-
-                        handled = true;
-                        break;
-                        //Thread.Sleep(2500);
-                    }
-                }
-
-                if (!handled)
-                {
-                    Console.WriteLine("Unhandled http_response: " + httpInfo.reqID);
-                }
-
-                httpInfo = iHttpReq.GetNextCompletedRequest();
-            }
-        }
-    }
-}