diff options
author | Melanie Thielker | 2008-09-21 21:47:00 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-21 21:47:00 +0000 |
commit | 94aaf67dfaafbcbd4d871f674c465a34c1c1f332 (patch) | |
tree | 33476e5660a95bdf7d29d14beae67a6294af28a7 /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |
parent | * minor: warnings removal (diff) | |
download | opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.zip opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.gz opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.bz2 opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
125 | /// <summary> | 125 | /// <summary> |
126 | /// Start all the scripts contained in this prim's inventory | 126 | /// Start all the scripts contained in this prim's inventory |
127 | /// </summary> | 127 | /// </summary> |
128 | public void CreateScriptInstances(int startParam, bool postOnRez) | 128 | public void CreateScriptInstances(int startParam, bool postOnRez, string engine) |
129 | { | 129 | { |
130 | lock (m_taskInventory) | 130 | lock (m_taskInventory) |
131 | { | 131 | { |
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
133 | { | 133 | { |
134 | if ((int)InventoryType.LSL == item.InvType) | 134 | if ((int)InventoryType.LSL == item.InvType) |
135 | { | 135 | { |
136 | CreateScriptInstance(item, startParam, postOnRez); | 136 | CreateScriptInstance(item, startParam, postOnRez, engine); |
137 | } | 137 | } |
138 | } | 138 | } |
139 | } | 139 | } |
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
162 | /// </summary> | 162 | /// </summary> |
163 | /// <param name="item"></param> | 163 | /// <param name="item"></param> |
164 | /// <returns></returns> | 164 | /// <returns></returns> |
165 | public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez) | 165 | public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez, string engine) |
166 | { | 166 | { |
167 | // m_log.InfoFormat( | 167 | // m_log.InfoFormat( |
168 | // "[PRIM INVENTORY]: " + | 168 | // "[PRIM INVENTORY]: " + |
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
193 | m_taskInventory[item.ItemID].PermsGranter = UUID.Zero; | 193 | m_taskInventory[item.ItemID].PermsGranter = UUID.Zero; |
194 | string script = Utils.BytesToString(asset.Data); | 194 | string script = Utils.BytesToString(asset.Data); |
195 | m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId, item.ItemID, script, | 195 | m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId, item.ItemID, script, |
196 | startParam, postOnRez); | 196 | startParam, postOnRez, engine); |
197 | m_parentGroup.AddActiveScriptCount(1); | 197 | m_parentGroup.AddActiveScriptCount(1); |
198 | ScheduleFullUpdate(); | 198 | ScheduleFullUpdate(); |
199 | } | 199 | } |
@@ -207,13 +207,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
207 | /// <param name="itemId"> | 207 | /// <param name="itemId"> |
208 | /// A <see cref="UUID"/> | 208 | /// A <see cref="UUID"/> |
209 | /// </param> | 209 | /// </param> |
210 | public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez) | 210 | public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine) |
211 | { | 211 | { |
212 | lock (m_taskInventory) | 212 | lock (m_taskInventory) |
213 | { | 213 | { |
214 | if (m_taskInventory.ContainsKey(itemId)) | 214 | if (m_taskInventory.ContainsKey(itemId)) |
215 | { | 215 | { |
216 | CreateScriptInstance(m_taskInventory[itemId], startParam, postOnRez); | 216 | CreateScriptInstance(m_taskInventory[itemId], startParam, postOnRez, engine); |
217 | } | 217 | } |
218 | else | 218 | else |
219 | { | 219 | { |