diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8760c84..0d9682e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -218,8 +218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
218 | 218 | ||
219 | // Update item with new asset | 219 | // Update item with new asset |
220 | item.AssetID = asset.FullID; | 220 | item.AssetID = asset.FullID; |
221 | if (group.UpdateInventoryItem(item)) | 221 | group.UpdateInventoryItem(item); |
222 | remoteClient.SendAgentAlertMessage("Script saved", false); | ||
223 | 222 | ||
224 | part.GetProperties(remoteClient); | 223 | part.GetProperties(remoteClient); |
225 | 224 | ||
@@ -232,10 +231,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
232 | // | 231 | // |
233 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); | 232 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); |
234 | } | 233 | } |
235 | else | ||
236 | { | ||
237 | remoteClient.SendAgentAlertMessage("Script saved", false); | ||
238 | } | ||
239 | part.ParentGroup.ResumeScripts(); | 234 | part.ParentGroup.ResumeScripts(); |
240 | return errors; | 235 | return errors; |
241 | } | 236 | } |
@@ -1401,13 +1396,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1401 | { | 1396 | { |
1402 | agentTransactions.HandleTaskItemUpdateFromTransaction( | 1397 | agentTransactions.HandleTaskItemUpdateFromTransaction( |
1403 | remoteClient, part, transactionID, currentItem); | 1398 | remoteClient, part, transactionID, currentItem); |
1404 | |||
1405 | if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) | ||
1406 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
1407 | else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | ||
1408 | remoteClient.SendAgentAlertMessage("Script saved", false); | ||
1409 | else | ||
1410 | remoteClient.SendAgentAlertMessage("Item saved", false); | ||
1411 | } | 1399 | } |
1412 | 1400 | ||
1413 | // Base ALWAYS has move | 1401 | // Base ALWAYS has move |
@@ -1993,7 +1981,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1993 | 1981 | ||
1994 | // We can only call this after adding the scene object, since the scene object references the scene | 1982 | // We can only call this after adding the scene object, since the scene object references the scene |
1995 | // to find out if scripts should be activated at all. | 1983 | // to find out if scripts should be activated at all. |
1996 | group.CreateScriptInstances(param, true, DefaultScriptEngine, 2); | 1984 | group.CreateScriptInstances(param, true, DefaultScriptEngine, 3); |
1997 | 1985 | ||
1998 | group.ScheduleGroupForFullUpdate(); | 1986 | group.ScheduleGroupForFullUpdate(); |
1999 | 1987 | ||