1 files changed, 38 insertions, 38 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/OSSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bc4e8ba..dbb78a4 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/OSSL_ScriptCommands.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -31,25 +31,25 @@ using Nini.Config;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Shared; 
+using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
 
-namespace OpenSim.Region.ScriptEngine.XEngine
+namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
     [Serializable]
-    public class OSSL_ScriptCommands : MarshalByRefObject, IOSSL_ScriptCommands
+    public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi
     {
-        internal XEngine m_ScriptEngine;
-        internal XScriptInstance m_Instance;
+        internal IScriptEngine m_ScriptEngine;
         internal SceneObjectPart m_host;
         internal uint m_localID;
         internal LLUUID m_itemID;
 
-        public OSSL_ScriptCommands(XEngine scriptEngine,
-                XScriptInstance instance, SceneObjectPart host,
-                uint localID, LLUUID itemID)
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID)
         {
-            m_ScriptEngine = scriptEngine;
-            m_Instance = instance;
+            m_ScriptEngine = ScriptEngine;
             m_host = host;
             m_localID = localID;
             m_itemID = itemID;
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public int osTerrainSetHeight(int x, int y, double val)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osTerrainSetHeight: permission denied");
                 return 0;
@@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public double osTerrainGetHeight(int x, int y)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osTerrainGetHeight: permission denied");
                 return 0.0;
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public int osRegionRestart(double seconds)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osRegionRestart: permission denied");
                 return 0;
@@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void osRegionNotice(string msg)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osRegionNotice: permission denied");
                 return;
@@ -132,7 +132,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void osSetRot(LLUUID target, Quaternion rotation)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetRot: permission denied");
                 return;
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
                                              int timer)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetDynamicTextureURL: permission denied");
                 return String.Empty;
@@ -178,7 +178,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
                                              int timer, int alpha)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetDynamicTextureURLBlend: permission denied");
                 return String.Empty;
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
                                            int timer)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetDynamicTextureData: permission denied");
                 return String.Empty;
@@ -233,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
                                           int timer, int alpha)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetDynamicTextureDataBlend: permission denied");
                 return String.Empty;
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public bool osConsoleCommand(string command)
         {
             m_host.AddScriptLPS(1);
-            if (m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowosConsoleCommand", false))
+            if (m_ScriptEngine.Config.GetBoolean("AllowosConsoleCommand", false))
             {
                 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID))
                 {
@@ -275,7 +275,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         }
         public void osSetPrimFloatOnWater(int floatYN)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetPrimFloatOnWater: permission denied");
                 return;
@@ -294,7 +294,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         // Adam's super super custom animation functions
         public void osAvatarPlayAnimation(string avatar, string animation)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osAvatarPlayAnimation: permission denied");
                 return;
@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void osAvatarStopAnimation(string avatar, string animation)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osAvatarStopAnimation: permission denied");
                 return;
@@ -327,7 +327,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         //Texture draw functions
         public string osMovePen(string drawList, int x, int y)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osMovePen: permission denied");
                 return String.Empty;
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawLine(string drawList, int startX, int startY, int endX, int endY)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawLine: permission denied");
                 return String.Empty;
@@ -353,7 +353,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawLine(string drawList, int endX, int endY)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawLine: permission denied");
                 return String.Empty;
@@ -366,7 +366,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawText(string drawList, string text)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawText: permission denied");
                 return String.Empty;
@@ -379,7 +379,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawEllipse(string drawList, int width, int height)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawEllipse: permission denied");
                 return String.Empty;
@@ -392,7 +392,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawRectangle(string drawList, int width, int height)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawRectangle: permission denied");
                 return String.Empty;
@@ -405,7 +405,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawFilledRectangle(string drawList, int width, int height)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawFilledRectangle: permission denied");
                 return String.Empty;
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osSetFontSize(string drawList, int fontSize)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetFontSize: permission denied");
                 return String.Empty;
@@ -431,7 +431,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osSetPenSize(string drawList, int penSize)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetPenSize: permission denied");
                 return String.Empty;
@@ -444,7 +444,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osSetPenColour(string drawList, string colour)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetPenColour: permission denied");
                 return String.Empty;
@@ -457,7 +457,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public string osDrawImage(string drawList, int width, int height, string imageUrl)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osDrawImage: permission denied");
                 return String.Empty;
@@ -470,7 +470,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void osSetStateEvents(int events)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetStateEvents: permission denied");
                 return;
@@ -481,7 +481,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void osSetRegionWaterHeight(double height)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetRegionWaterHeight: permission denied");
                 return;
@@ -498,7 +498,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public double osList2Double(LSL_Types.list src, int index)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osList2Double: permission denied");
                 return 0.0;
@@ -518,7 +518,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void osSetParcelMediaURL(string url)
         {
-            if (!m_ScriptEngine.ScriptConfigSource.GetBoolean("AllowOSFunctions", false))
+            if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
             {
                 OSSLError("osSetParcelMediaURL: permission denied");
                 return;