diff options
author | teravus | 2012-11-15 10:05:16 -0500 |
---|---|---|
committer | teravus | 2012-11-15 10:05:16 -0500 |
commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Framework/TaskInventoryItem.cs | |
parent | Merge master into teravuswork (diff) | |
download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Framework/TaskInventoryItem.cs')
-rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 574ee56..fb818ee 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
@@ -73,6 +73,9 @@ 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 | |||
76 | public UUID AssetID { | 79 | public UUID AssetID { |
77 | get { | 80 | get { |
78 | return _assetID; | 81 | return _assetID; |
@@ -350,13 +353,14 @@ namespace OpenSim.Framework | |||
350 | } | 353 | } |
351 | } | 354 | } |
352 | 355 | ||
353 | /// <summary> | 356 | public bool ScriptRunning { |
354 | /// This used ONLY during copy. It can't be relied on at other times! | 357 | get { |
355 | /// </summary> | 358 | return _scriptRunning; |
356 | /// <remarks> | 359 | } |
357 | /// For true script running status, use IEntityInventory.TryGetScriptInstanceRunning() for now. | 360 | set { |
358 | /// </remarks> | 361 | _scriptRunning = value; |
359 | public bool ScriptRunning { get; set; } | 362 | } |
363 | } | ||
360 | 364 | ||
361 | // See ICloneable | 365 | // See ICloneable |
362 | 366 | ||
@@ -384,7 +388,6 @@ namespace OpenSim.Framework | |||
384 | 388 | ||
385 | public TaskInventoryItem() | 389 | public TaskInventoryItem() |
386 | { | 390 | { |
387 | ScriptRunning = true; | ||
388 | CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 391 | CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
389 | } | 392 | } |
390 | } | 393 | } |