From 94aaf67dfaafbcbd4d871f674c465a34c1c1f332 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 21 Sep 2008 21:47:00 +0000
Subject: Change the scirpt engine loading mechanism. Script engines are now
 ordinary region modules and are able to coexist in one instance. See
 http://opensimulator.org/wiki/ScriptEngines for details. There were changes
 to OpenSim.ini.example, please note DefaultScriptEngine. Also see the User
 docs and FAQ on the Wiki. Default is DotNetEngine.

---
 .../Region/Environment/Scenes/SceneObjectPart.Inventory.cs   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 08f8cee..061d961 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// Start all the scripts contained in this prim's inventory
         /// </summary>
-        public void CreateScriptInstances(int startParam, bool postOnRez)
+        public void CreateScriptInstances(int startParam, bool postOnRez, string engine)
         {
             lock (m_taskInventory)
             {
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     if ((int)InventoryType.LSL == item.InvType)
                     {
-                        CreateScriptInstance(item, startParam, postOnRez);
+                        CreateScriptInstance(item, startParam, postOnRez, engine);
                     }
                 }
             }
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez)
+        public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez, string engine)
         {
             // m_log.InfoFormat(
             //     "[PRIM INVENTORY]: " +
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Scenes
                                        m_taskInventory[item.ItemID].PermsGranter = UUID.Zero;
                                        string script = Utils.BytesToString(asset.Data);
                                        m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId, item.ItemID, script, 
-                                                                                         startParam, postOnRez);
+                                                                                         startParam, postOnRez, engine);
                                        m_parentGroup.AddActiveScriptCount(1);
                                        ScheduleFullUpdate();
                                    }
@@ -207,13 +207,13 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="itemId">
         /// A <see cref="UUID"/>
         /// </param>
-        public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez)
+        public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine)
         {
             lock (m_taskInventory)
             {
                 if (m_taskInventory.ContainsKey(itemId))
                 {
-                    CreateScriptInstance(m_taskInventory[itemId], startParam, postOnRez);
+                    CreateScriptInstance(m_taskInventory[itemId], startParam, postOnRez, engine);
                 }
                 else
                 {
-- 
cgit v1.1