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/Framework | |
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/Framework')
-rw-r--r-- | OpenSim/Framework/TaskInventoryDictionary.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs index 421bd5d..8af2c41 100644 --- a/OpenSim/Framework/TaskInventoryDictionary.cs +++ b/OpenSim/Framework/TaskInventoryDictionary.cs | |||
@@ -35,10 +35,12 @@ using OpenMetaverse; | |||
35 | namespace OpenSim.Framework | 35 | namespace OpenSim.Framework |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// A dictionary for task inventory. | 38 | /// A dictionary containing task inventory items. Indexed by item UUID. |
39 | /// </summary> | 39 | /// </summary> |
40 | /// <remarks> | ||
40 | /// This class is not thread safe. Callers must synchronize on Dictionary methods or Clone() this object before | 41 | /// This class is not thread safe. Callers must synchronize on Dictionary methods or Clone() this object before |
41 | /// iterating over it. | 42 | /// iterating over it. |
43 | /// </remarks> | ||
42 | public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>, | 44 | public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>, |
43 | ICloneable, IXmlSerializable | 45 | ICloneable, IXmlSerializable |
44 | { | 46 | { |
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 3b40381..a06f8e7 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
@@ -73,9 +73,6 @@ namespace OpenSim.Framework | |||
73 | 73 | ||
74 | private bool _ownerChanged = false; | 74 | private bool _ownerChanged = false; |
75 | 75 | ||
76 | // This used ONLY during copy. It can't be relied on at other times! | ||
77 | private bool _scriptRunning = true; | ||
78 | |||
79 | public UUID AssetID { | 76 | public UUID AssetID { |
80 | get { | 77 | get { |
81 | return _assetID; | 78 | return _assetID; |
@@ -353,14 +350,13 @@ namespace OpenSim.Framework | |||
353 | } | 350 | } |
354 | } | 351 | } |
355 | 352 | ||
356 | public bool ScriptRunning { | 353 | /// <summary> |
357 | get { | 354 | /// This used ONLY during copy. It can't be relied on at other times! |
358 | return _scriptRunning; | 355 | /// </summary> |
359 | } | 356 | /// <remarks> |
360 | set { | 357 | /// For true script running status, use IEntityInventory.TryGetScriptInstanceRunning() for now. |
361 | _scriptRunning = value; | 358 | /// </remarks> |
362 | } | 359 | public bool ScriptRunning { get; set; } |
363 | } | ||
364 | 360 | ||
365 | // See ICloneable | 361 | // See ICloneable |
366 | 362 | ||
@@ -388,6 +384,7 @@ namespace OpenSim.Framework | |||
388 | 384 | ||
389 | public TaskInventoryItem() | 385 | public TaskInventoryItem() |
390 | { | 386 | { |
387 | ScriptRunning = true; | ||
391 | CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 388 | CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
392 | } | 389 | } |
393 | } | 390 | } |