aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs19
1 files changed, 8 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 015b140..2a9be81 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -445,7 +445,6 @@ namespace OpenSim.Region.Environment.Scenes
445 } 445 }
446 else 446 else
447 { 447 {
448 Console.WriteLine("Non-Prim item ==>");
449 itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions; 448 itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions;
450 } 449 }
451 450
@@ -896,6 +895,9 @@ namespace OpenSim.Region.Environment.Scenes
896 if (group != null) 895 if (group != null)
897 { 896 {
898 TaskInventoryItem item = group.GetInventoryItem(localID, itemID); 897 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
898 if (item == null)
899 return;
900
899 if (item.Type == 10) 901 if (item.Type == 10)
900 { 902 {
901 EventManager.TriggerRemoveScript(localID, itemID); 903 EventManager.TriggerRemoveScript(localID, itemID);
@@ -2311,16 +2313,6 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
2311 2313
2312 } 2314 }
2313 2315
2314 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
2315 {
2316 IScriptModule scriptModule = RequestModuleInterface<IScriptModule>();
2317 if (scriptModule == null)
2318 return;
2319
2320 controllingClient.SendScriptRunningReply(objectID, itemID,
2321 scriptModule.GetScriptRunning(objectID, itemID));
2322 }
2323
2324 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running) 2316 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
2325 { 2317 {
2326 SceneObjectPart part = GetSceneObjectPart(objectID); 2318 SceneObjectPart part = GetSceneObjectPart(objectID);
@@ -2388,5 +2380,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
2388 } 2380 }
2389 m_innerScene.DetachSingleAttachmentToInv(itemID, remoteClient); 2381 m_innerScene.DetachSingleAttachmentToInv(itemID, remoteClient);
2390 } 2382 }
2383
2384 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
2385 {
2386 EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID);
2387 }
2391 } 2388 }
2392} 2389}