diff options
| author | Diva Canto | 2010-07-14 11:02:41 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-14 11:09:27 -0700 |
| commit | 3ca3522ad154c644ff270982574b4975da201f7c (patch) | |
| tree | e679ebf50c523dbfb450b2bdef92a2b853a6212a /OpenSim | |
| parent | comment out obsolete assert that 'item has been passed to another user since ... (diff) | |
| download | opensim-SC-3ca3522ad154c644ff270982574b4975da201f7c.zip opensim-SC-3ca3522ad154c644ff270982574b4975da201f7c.tar.gz opensim-SC-3ca3522ad154c644ff270982574b4975da201f7c.tar.bz2 opensim-SC-3ca3522ad154c644ff270982574b4975da201f7c.tar.xz | |
Fixes mantis #4870.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 8 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index d30e954..3d6e7f3 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
| @@ -182,7 +182,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 182 | 182 | ||
| 183 | if (part.Inventory.UpdateInventoryItem(item)) | 183 | if (part.Inventory.UpdateInventoryItem(item)) |
| 184 | { | 184 | { |
| 185 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 185 | if ((InventoryType)item.InvType == InventoryType.Notecard) |
| 186 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
| 187 | else if ((InventoryType)item.InvType == InventoryType.LSL) | ||
| 188 | remoteClient.SendAgentAlertMessage("Script saved", false); | ||
| 189 | else | ||
| 190 | remoteClient.SendAgentAlertMessage("Item saved", false); | ||
| 191 | |||
| 186 | part.GetProperties(remoteClient); | 192 | part.GetProperties(remoteClient); |
| 187 | } | 193 | } |
| 188 | } | 194 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index f58e27e..96a9d97 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1342,7 +1342,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1342 | } | 1342 | } |
| 1343 | if (part.Inventory.UpdateInventoryItem(itemInfo)) | 1343 | if (part.Inventory.UpdateInventoryItem(itemInfo)) |
| 1344 | { | 1344 | { |
| 1345 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 1345 | if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) |
| 1346 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
| 1347 | else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | ||
| 1348 | remoteClient.SendAgentAlertMessage("Script saved", false); | ||
| 1349 | else | ||
| 1350 | remoteClient.SendAgentAlertMessage("Item saved", false); | ||
| 1351 | |||
| 1346 | part.GetProperties(remoteClient); | 1352 | part.GetProperties(remoteClient); |
| 1347 | } | 1353 | } |
| 1348 | } | 1354 | } |