diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index ac9644e..15b5230 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -202,7 +202,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
202 | 202 | ||
203 | // Update item with new asset | 203 | // Update item with new asset |
204 | item.AssetID = asset.FullID; | 204 | item.AssetID = asset.FullID; |
205 | group.UpdateInventoryItem(item); | 205 | if (group.UpdateInventoryItem(item)) |
206 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
207 | |||
206 | part.GetProperties(remoteClient); | 208 | part.GetProperties(remoteClient); |
207 | 209 | ||
208 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) | 210 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) |
@@ -1226,7 +1228,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1226 | remoteClient, part, transactionID, currentItem); | 1228 | remoteClient, part, transactionID, currentItem); |
1227 | } | 1229 | } |
1228 | if (part.Inventory.UpdateInventoryItem(itemInfo)) | 1230 | if (part.Inventory.UpdateInventoryItem(itemInfo)) |
1231 | { | ||
1232 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
1229 | part.GetProperties(remoteClient); | 1233 | part.GetProperties(remoteClient); |
1234 | } | ||
1230 | } | 1235 | } |
1231 | } | 1236 | } |
1232 | else | 1237 | else |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 68f0122..3b1b567 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -626,16 +626,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
626 | { | 626 | { |
627 | item.AssetID = m_items[item.ItemID].AssetID; | 627 | item.AssetID = m_items[item.ItemID].AssetID; |
628 | } | 628 | } |
629 | else if ((InventoryType)item.Type == InventoryType.Notecard) | ||
630 | { | ||
631 | ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID); | ||
632 | |||
633 | if (presence != null) | ||
634 | { | ||
635 | presence.ControllingClient.SendAgentAlertMessage( | ||
636 | "Notecard saved", false); | ||
637 | } | ||
638 | } | ||
639 | 629 | ||
640 | m_items[item.ItemID] = item; | 630 | m_items[item.ItemID] = item; |
641 | m_inventorySerial++; | 631 | m_inventorySerial++; |