diff options
author | Melanie | 2013-06-23 01:49:45 +0100 |
---|---|---|
committer | Melanie | 2013-06-23 01:49:45 +0100 |
commit | 936700bda3969bc54166f0d6a3ca81e3d5c42935 (patch) | |
tree | 6bb97abf25f4a3f22ccb40e3b4be20c551327b09 /OpenSim/Region/Framework | |
parent | Fix prim locking to behave like SL (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.zip opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.gz opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.bz2 opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 6c79b13..1e4d558 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -326,7 +326,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
326 | // Update item with new asset | 326 | // Update item with new asset |
327 | item.AssetID = asset.FullID; | 327 | item.AssetID = asset.FullID; |
328 | if (group.UpdateInventoryItem(item)) | 328 | if (group.UpdateInventoryItem(item)) |
329 | remoteClient.SendAgentAlertMessage("Script saved", false); | 329 | remoteClient.SendAlertMessage("Script saved"); |
330 | 330 | ||
331 | part.SendPropertiesToClient(remoteClient); | 331 | part.SendPropertiesToClient(remoteClient); |
332 | 332 | ||
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
342 | } | 342 | } |
343 | else | 343 | else |
344 | { | 344 | { |
345 | remoteClient.SendAgentAlertMessage("Script saved", false); | 345 | remoteClient.SendAlertMessage("Script saved"); |
346 | } | 346 | } |
347 | 347 | ||
348 | // Tell anyone managing scripts that a script has been reloaded/changed | 348 | // Tell anyone managing scripts that a script has been reloaded/changed |
@@ -1616,11 +1616,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1616 | remoteClient, part, transactionID, currentItem); | 1616 | remoteClient, part, transactionID, currentItem); |
1617 | 1617 | ||
1618 | if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) | 1618 | if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) |
1619 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 1619 | remoteClient.SendAlertMessage("Notecard saved"); |
1620 | else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | 1620 | else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) |
1621 | remoteClient.SendAgentAlertMessage("Script saved", false); | 1621 | remoteClient.SendAlertMessage("Script saved"); |
1622 | else | 1622 | else |
1623 | remoteClient.SendAgentAlertMessage("Item saved", false); | 1623 | remoteClient.SendAlertMessage("Item saved"); |
1624 | } | 1624 | } |
1625 | 1625 | ||
1626 | // Base ALWAYS has move | 1626 | // Base ALWAYS has move |