aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent
diff options
context:
space:
mode:
authorMelanie2010-07-14 19:53:15 +0100
committerMelanie2010-07-14 19:53:15 +0100
commit0b74662ce2e0d0afebf977b71c34b5246b81b8f9 (patch)
tree4fd2b4437e7a0621f3ddad4986a31d9dc328b4ee /OpenSim/Region/CoreModules/Agent
parentMajor attachments cleanup. Remove unused AttachObject ClientView method (diff)
parentMajor attachments cleanup. Remove unused AttachObject ClientView method (diff)
downloadopensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.zip
opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.gz
opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.bz2
opensim-SC-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs8
1 files changed, 7 insertions, 1 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 }