Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

OpenSim/Framework/TaskInventoryDictionary.cs

@@ -39,10 +39,12 @@ using OpenMetaverse;
 namespace OpenSim.Framework
 {
     /// <summary>
-    /// A dictionary for task inventory.
+    /// A dictionary containing task inventory items.  Indexed by item UUID.
     /// </summary>
+    /// <remarks>
     /// This class is not thread safe.  Callers must synchronize on Dictionary methods or Clone() this object before
     /// iterating over it.
+    /// </remarks>
     public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
                                            ICloneable, IXmlSerializable
     {

OpenSim/Framework/TaskInventoryItem.cs

@@ -73,9 +73,6 @@ namespace OpenSim.Framework
 
         private bool _ownerChanged = false;
         
-        // This used ONLY during copy. It can't be relied on at other times!
-        private bool _scriptRunning = true;
-
         public UUID AssetID {
             get {
                 return _assetID;
@@ -353,14 +350,13 @@ namespace OpenSim.Framework
             }
         }
 
-        public bool ScriptRunning {
-            get {
-                return _scriptRunning;
-            }
-            set {
-                _scriptRunning = value;
-            }
-        }
+        /// <summary>
+        /// This used ONLY during copy. It can't be relied on at other times!
+        /// </summary>
+        /// <remarks>
+        /// For true script running status, use IEntityInventory.TryGetScriptInstanceRunning() for now.
+        /// </remarks>
+        public bool ScriptRunning { get; set; }
 
         // See ICloneable
 
@@ -388,6 +384,7 @@ namespace OpenSim.Framework
 
         public TaskInventoryItem()
         {
+            ScriptRunning = true;
             CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
         }
     }