diff options
author | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
commit | 664e8a464e4608afeb590a3330ccc69e7988138b (patch) | |
tree | 099c17a1769a7e7ac16232c5a20f5d9515a1d480 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | Cause llGetInventoryType to return the asset type, which corresponds with (diff) | |
download | opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.zip opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.gz opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.bz2 opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.xz |
Script region crossing. This has not user functionality, but lays all the
groundwork.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 4e93551..b0bac42 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
61 | { | 61 | { |
62 | if (group is SceneObjectGroup) | 62 | if (group is SceneObjectGroup) |
63 | { | 63 | { |
64 | ((SceneObjectGroup) group).CreateScriptInstances(0, false, DefaultScriptEngine); | 64 | ((SceneObjectGroup) group).CreateScriptInstances(0, false, DefaultScriptEngine, 0); |
65 | } | 65 | } |
66 | } | 66 | } |
67 | } | 67 | } |
@@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
292 | { | 292 | { |
293 | // Needs to determine which engine was running it and use that | 293 | // Needs to determine which engine was running it and use that |
294 | // | 294 | // |
295 | part.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine); | 295 | part.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); |
296 | } | 296 | } |
297 | else | 297 | else |
298 | { | 298 | { |
@@ -1343,7 +1343,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1343 | part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); | 1343 | part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); |
1344 | // TODO: switch to posting on_rez here when scripts | 1344 | // TODO: switch to posting on_rez here when scripts |
1345 | // have state in inventory | 1345 | // have state in inventory |
1346 | part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine); | 1346 | part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); |
1347 | 1347 | ||
1348 | // m_log.InfoFormat("[PRIMINVENTORY]: " + | 1348 | // m_log.InfoFormat("[PRIMINVENTORY]: " + |
1349 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 1349 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
@@ -1407,7 +1407,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1407 | part.AddInventoryItem(taskItem); | 1407 | part.AddInventoryItem(taskItem); |
1408 | part.GetProperties(remoteClient); | 1408 | part.GetProperties(remoteClient); |
1409 | 1409 | ||
1410 | part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine); | 1410 | part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); |
1411 | } | 1411 | } |
1412 | } | 1412 | } |
1413 | 1413 | ||
@@ -1503,7 +1503,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1503 | 1503 | ||
1504 | if (running > 0) | 1504 | if (running > 0) |
1505 | { | 1505 | { |
1506 | destPart.CreateScriptInstance(destTaskItem, 0, false, DefaultScriptEngine); | 1506 | destPart.CreateScriptInstance(destTaskItem, 0, false, DefaultScriptEngine, 0); |
1507 | } | 1507 | } |
1508 | 1508 | ||
1509 | ScenePresence avatar; | 1509 | ScenePresence avatar; |
@@ -2050,7 +2050,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2050 | } | 2050 | } |
2051 | 2051 | ||
2052 | // Fire on_rez | 2052 | // Fire on_rez |
2053 | group.CreateScriptInstances(0, true, DefaultScriptEngine); | 2053 | group.CreateScriptInstances(0, true, DefaultScriptEngine, 0); |
2054 | 2054 | ||
2055 | if (!attachment) | 2055 | if (!attachment) |
2056 | rootPart.ScheduleFullUpdate(); | 2056 | rootPart.ScheduleFullUpdate(); |
@@ -2154,7 +2154,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2154 | group.UpdateGroupRotation(rot); | 2154 | group.UpdateGroupRotation(rot); |
2155 | //group.ApplyPhysics(m_physicalPrim); | 2155 | //group.ApplyPhysics(m_physicalPrim); |
2156 | group.Velocity = vel; | 2156 | group.Velocity = vel; |
2157 | group.CreateScriptInstances(param, true, DefaultScriptEngine); | 2157 | group.CreateScriptInstances(param, true, DefaultScriptEngine, 0); |
2158 | rootPart.ScheduleFullUpdate(); | 2158 | rootPart.ScheduleFullUpdate(); |
2159 | 2159 | ||
2160 | if (!ExternalChecks.ExternalChecksBypassPermissions()) | 2160 | if (!ExternalChecks.ExternalChecksBypassPermissions()) |