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/Scene.Inventory.cs | |
parent | * minor: warnings removal (diff) | |
download | opensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.zip opensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.gz opensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index f575ecd..c670076 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
69 | { | 69 | { |
70 | if (group is SceneObjectGroup) | 70 | if (group is SceneObjectGroup) |
71 | { | 71 | { |
72 | ((SceneObjectGroup) group).CreateScriptInstances(0, false); | 72 | ((SceneObjectGroup) group).CreateScriptInstances(0, false, DefaultScriptEngine); |
73 | } | 73 | } |
74 | } | 74 | } |
75 | } | 75 | } |
@@ -269,7 +269,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
269 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) | 269 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) |
270 | if (isScriptRunning) | 270 | if (isScriptRunning) |
271 | { | 271 | { |
272 | part.CreateScriptInstance(item.ItemID, 0, false); | 272 | // Needs to determine which engine was running it and use that |
273 | // | ||
274 | part.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine); | ||
273 | } | 275 | } |
274 | } | 276 | } |
275 | 277 | ||
@@ -1289,7 +1291,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
1289 | 1291 | ||
1290 | part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); | 1292 | part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); |
1291 | // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez | 1293 | // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez |
1292 | part.CreateScriptInstance(copyID, 0, false); | 1294 | part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine); |
1293 | 1295 | ||
1294 | // m_log.InfoFormat("[PRIMINVENTORY]: " + | 1296 | // m_log.InfoFormat("[PRIMINVENTORY]: " + |
1295 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 1297 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
@@ -1353,7 +1355,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
1353 | part.AddInventoryItem(taskItem); | 1355 | part.AddInventoryItem(taskItem); |
1354 | part.GetProperties(remoteClient); | 1356 | part.GetProperties(remoteClient); |
1355 | 1357 | ||
1356 | part.CreateScriptInstance(taskItem, 0, false); | 1358 | part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine); |
1357 | } | 1359 | } |
1358 | } | 1360 | } |
1359 | 1361 | ||
@@ -1449,7 +1451,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
1449 | 1451 | ||
1450 | if (running > 0) | 1452 | if (running > 0) |
1451 | { | 1453 | { |
1452 | destPart.CreateScriptInstance(destTaskItem, 0, false); | 1454 | destPart.CreateScriptInstance(destTaskItem, 0, false, DefaultScriptEngine); |
1453 | } | 1455 | } |
1454 | 1456 | ||
1455 | ScenePresence avatar; | 1457 | ScenePresence avatar; |
@@ -2037,7 +2039,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
2037 | } | 2039 | } |
2038 | 2040 | ||
2039 | // TODO: make this true to fire on_rez when scripts have state while in inventory | 2041 | // TODO: make this true to fire on_rez when scripts have state while in inventory |
2040 | group.CreateScriptInstances(0, false); | 2042 | group.CreateScriptInstances(0, false, DefaultScriptEngine); |
2041 | 2043 | ||
2042 | if (!attachment) | 2044 | if (!attachment) |
2043 | rootPart.ScheduleFullUpdate(); | 2045 | rootPart.ScheduleFullUpdate(); |
@@ -2141,7 +2143,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
2141 | group.UpdateGroupRotation(rot); | 2143 | group.UpdateGroupRotation(rot); |
2142 | //group.ApplyPhysics(m_physicalPrim); | 2144 | //group.ApplyPhysics(m_physicalPrim); |
2143 | group.Velocity = vel; | 2145 | group.Velocity = vel; |
2144 | group.CreateScriptInstances(param, true); | 2146 | group.CreateScriptInstances(param, true, DefaultScriptEngine); |
2145 | rootPart.ScheduleFullUpdate(); | 2147 | rootPart.ScheduleFullUpdate(); |
2146 | 2148 | ||
2147 | if (!ExternalChecks.ExternalChecksBypassPermissions()) | 2149 | if (!ExternalChecks.ExternalChecksBypassPermissions()) |