diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 4d07746d2a..62ecbd1018 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -39,10 +39,12 @@ using OpenMetaverse;
namespace OpenSim.Framework
{
///
- /// A dictionary for task inventory.
+ /// A dictionary containing task inventory items. Indexed by item UUID.
///
+ ///
/// This class is not thread safe. Callers must synchronize on Dictionary methods or Clone() this object before
/// iterating over it.
+ ///
public class TaskInventoryDictionary : Dictionary,
ICloneable, IXmlSerializable
{
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index fb818ee74b..574ee567f4 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/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;
- }
- }
+ ///
+ /// This used ONLY during copy. It can't be relied on at other times!
+ ///
+ ///
+ /// For true script running status, use IEntityInventory.TryGetScriptInstanceRunning() for now.
+ ///
+ 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;
}
}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3c65647dc4..1f6af4ac83 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5314,8 +5314,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false);
AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false);
AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest, false);
- AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest, false);
- AddLocalPacketHandler(PacketType.ObjectGroup, HandleObjectGroupRequest, false);
+ AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest);
+ AddLocalPacketHandler(PacketType.ObjectGroup, HandleObjectGroupRequest);
AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage);
AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest);
AddLocalPacketHandler(PacketType.ChatFromViewer, HandleChatFromViewer);
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index e711afbbbb..acd156e855 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -639,9 +639,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (grp.HasGroupChanged)
{
-// m_log.DebugFormat(
-// "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
-// grp.UUID, grp.AttachmentPoint);
+ m_log.DebugFormat(
+ "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
+ grp.UUID, grp.AttachmentPoint);
string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState);
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index b2c9bce7e5..ab8f14344b 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
cdt.AddColumn("Asset UUID", 36);
foreach (TaskInventoryItem item in inv.GetInventoryItems())
+ {
+ bool foundScriptInstance, scriptRunning;
+ foundScriptInstance
+ = SceneObjectPartInventory.TryGetScriptInstanceRunning(m_scene, item, out scriptRunning);
+
cdt.AddRow(
item.Name,
((InventoryType)item.InvType).ToString(),
- (InventoryType)item.InvType == InventoryType.LSL ? item.ScriptRunning.ToString() : "n/a",
+ foundScriptInstance ? scriptRunning.ToString() : "n/a",
item.ItemID.ToString(),
item.AssetID.ToString());
+ }
return sb.Append(cdt.ToString());
}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 9d921def58..8028d87099 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -151,6 +151,19 @@ namespace OpenSim.Region.Framework.Interfaces
///
void StopScriptInstance(UUID itemId);
+ ///
+ /// Try to get the script running status.
+ ///
+ ///
+ /// 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.
+ ///
+ ///
+ ///
+ bool TryGetScriptInstanceRunning(UUID itemId, out bool running);
+
///
/// Add an item to this entity's inventory. If an item with the same name already exists, then an alternative
/// name is chosen.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index f41e3291e9..3a9a146ee0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -244,31 +244,52 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part == null || m_part.ParentGroup == null || m_part.ParentGroup.Scene == null)
return;
- IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces();
- if (engines == null) // No engine at all
- return;
-
Items.LockItemsForRead(true);
foreach (TaskInventoryItem item in Items.Values)
{
if (item.InvType == (int)InventoryType.LSL)
{
- foreach (IScriptModule e in engines)
- {
- bool running;
-
- if (e.HasScript(item.ItemID, out running))
- {
- item.ScriptRunning = running;
- break;
- }
- }
+ bool running;
+ if (TryGetScriptInstanceRunning(m_part.ParentGroup.Scene, item, out running))
+ item.ScriptRunning = running;
}
}
Items.LockItemsForRead(false);
}
+ public bool TryGetScriptInstanceRunning(UUID itemId, out bool running)
+ {
+ running = false;
+
+ TaskInventoryItem item = GetInventoryItem(itemId);
+
+ if (item == null)
+ return false;
+
+ return TryGetScriptInstanceRunning(m_part.ParentGroup.Scene, item, out running);
+ }
+
+ public static bool TryGetScriptInstanceRunning(Scene scene, TaskInventoryItem item, out bool running)
+ {
+ running = false;
+
+ if (item.InvType != (int)InventoryType.LSL)
+ return false;
+
+ IScriptModule[] engines = scene.RequestModuleInterfaces();
+ if (engines == null) // No engine at all
+ return false;
+
+ foreach (IScriptModule e in engines)
+ {
+ if (e.HasScript(item.ItemID, out running))
+ return true;
+ }
+
+ return false;
+ }
+
public int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
{
int scriptsValidForStarting = 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs b/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs
index ae67fc5585..f55ba7e6c5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs
@@ -26,9 +26,11 @@
*/
using System;
+using System.Runtime.Serialization;
namespace OpenSim.Region.ScriptEngine.Shared
{
+ [Serializable]
public class ScriptException : Exception
{
public ScriptException() : base() {}
@@ -36,5 +38,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
public ScriptException(string message) : base(message) {}
public ScriptException(string message, Exception innerException) : base(message, innerException) {}
+
+ public ScriptException(SerializationInfo info, StreamingContext context) :base(info, context) {}
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index f247a0be42..f331658662 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
// log4net.Config.XmlConfigurator.Configure();
UUID userId = TestHelpers.ParseTail(0x1);
-// UUID objectId = TestHelpers.ParseTail(0x2);
+// UUID objectId = TestHelpers.ParseTail(0x100);
// UUID itemId = TestHelpers.ParseTail(0x3);
string itemName = "TestStartScript() Item";
@@ -105,12 +105,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
m_scene.EventManager.OnChatFromWorld += OnChatFromWorld;
- m_scene.RezNewScript(userId, itemTemplate);
+ SceneObjectPart partWhereRezzed = m_scene.RezNewScript(userId, itemTemplate);
m_chatEvent.WaitOne(60000);
Assert.That(m_osChatMessageReceived, Is.Not.Null, "No chat message received in TestStartScript()");
Assert.That(m_osChatMessageReceived.Message, Is.EqualTo("Script running"));
+
+ bool running;
+ TaskInventoryItem scriptItem = partWhereRezzed.Inventory.GetInventoryItem(itemName);
+ Assert.That(
+ SceneObjectPartInventory.TryGetScriptInstanceRunning(m_scene, scriptItem, out running), Is.True);
+ Assert.That(running, Is.True);
}
private void OnChatFromWorld(object sender, OSChatMessage oscm)