aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-07-14 19:53:15 +0100
committerMelanie2010-07-14 19:53:15 +0100
commit0b74662ce2e0d0afebf977b71c34b5246b81b8f9 (patch)
tree4fd2b4437e7a0621f3ddad4986a31d9dc328b4ee /OpenSim/Region/Framework
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 '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e972382..c77efc7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1362,7 +1362,13 @@ namespace OpenSim.Region.Framework.Scenes
1362 } 1362 }
1363 if (part.Inventory.UpdateInventoryItem(itemInfo)) 1363 if (part.Inventory.UpdateInventoryItem(itemInfo))
1364 { 1364 {
1365 // remoteClient.SendAgentAlertMessage("Notecard saved", false); 1365 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1366 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1367 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1368 remoteClient.SendAgentAlertMessage("Script saved", false);
1369 else
1370 remoteClient.SendAgentAlertMessage("Item saved", false);
1371
1366 part.GetProperties(remoteClient); 1372 part.GetProperties(remoteClient);
1367 } 1373 }
1368 } 1374 }