Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 3 insertions, 24 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 8028d87..4274cbe 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -152,19 +152,6 @@ namespace OpenSim.Region.Framework.Interfaces
         void StopScriptInstance(UUID itemId);
 
         /// <summary>
-        /// Try to get the script running status.
-        /// </summary>
-        /// <returns>
-        /// Returns true if a script for the item was found in one of the simulator's script engines.  In this case,
-        /// the running parameter will reflect the running status.
-        /// Returns false if the item could not be found, if the item is not a script or if a script instance for the
-        /// item was not found in any of the script engines.  In this case, running status is irrelevant.
-        /// </returns>
-        /// <param name='itemId'></param>
-        /// <param name='running'></param>
-        bool TryGetScriptInstanceRunning(UUID itemId, out bool running);
-
-        /// <summary>
         /// Add an item to this entity's inventory.  If an item with the same name already exists, then an alternative
         /// name is chosen.
         /// </summary>
@@ -283,25 +270,17 @@ namespace OpenSim.Region.Framework.Interfaces
         void ApplyGodPermissions(uint perms);
 
         /// <summary>
-        /// Number of items in this inventory.
-        /// </summary>
-        int Count { get; }
-
-        /// <summary>
         /// Returns true if this inventory contains any scripts
         /// </summary></returns>
         bool ContainsScripts();
 
         /// <summary>
-        /// Number of scripts in this inventory.
-        /// </summary>
-        /// <remarks>
-        /// Includes both running and non running scripts.
-        /// </remarks>
+        /// Returns the count of scripts contained
+        /// </summary></returns>
         int ScriptCount();
 
         /// <summary>
-        /// Number of running scripts in this inventory.
+        /// Returns the count of running scripts contained
         /// </summary></returns>
         int RunningScriptCount();