diff options
author | Justin Clark-Casey (justincc) | 2012-10-31 00:31:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-31 00:31:18 +0000 |
commit | 6235d16c3148bb6f9f881b0dc286deccfdf9148a (patch) | |
tree | 1d8d9e0b5bdf5872dbf6ff19f87c99593d3e2505 /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.zip opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.tar.gz opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.tar.bz2 opensim-SC_OLD-6235d16c3148bb6f9f881b0dc286deccfdf9148a.tar.xz |
Make "show object part" command correctly display script status.
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index b2c9bce..ab8f143 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -606,12 +606,18 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
606 | cdt.AddColumn("Asset UUID", 36); | 606 | cdt.AddColumn("Asset UUID", 36); |
607 | 607 | ||
608 | foreach (TaskInventoryItem item in inv.GetInventoryItems()) | 608 | foreach (TaskInventoryItem item in inv.GetInventoryItems()) |
609 | { | ||
610 | bool foundScriptInstance, scriptRunning; | ||
611 | foundScriptInstance | ||
612 | = SceneObjectPartInventory.TryGetScriptInstanceRunning(m_scene, item, out scriptRunning); | ||
613 | |||
609 | cdt.AddRow( | 614 | cdt.AddRow( |
610 | item.Name, | 615 | item.Name, |
611 | ((InventoryType)item.InvType).ToString(), | 616 | ((InventoryType)item.InvType).ToString(), |
612 | (InventoryType)item.InvType == InventoryType.LSL ? item.ScriptRunning.ToString() : "n/a", | 617 | foundScriptInstance ? scriptRunning.ToString() : "n/a", |
613 | item.ItemID.ToString(), | 618 | item.ItemID.ToString(), |
614 | item.AssetID.ToString()); | 619 | item.AssetID.ToString()); |
620 | } | ||
615 | 621 | ||
616 | return sb.Append(cdt.ToString()); | 622 | return sb.Append(cdt.ToString()); |
617 | } | 623 | } |