diff options
author | Justin Clark-Casey (justincc) | 2010-04-19 21:25:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-19 21:25:59 +0100 |
commit | 524a2a9e26794e2ed645d51c089be42633a782df (patch) | |
tree | 751eed37530a91a881e14b4a035d5760c2e65503 /OpenSim/Region/Framework | |
parent | If a transfer request is received for a task inventory item asset, then route... (diff) | |
download | opensim-SC_OLD-524a2a9e26794e2ed645d51c089be42633a782df.zip opensim-SC_OLD-524a2a9e26794e2ed645d51c089be42633a782df.tar.gz opensim-SC_OLD-524a2a9e26794e2ed645d51c089be42633a782df.tar.bz2 opensim-SC_OLD-524a2a9e26794e2ed645d51c089be42633a782df.tar.xz |
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
Diffstat (limited to '')
-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 7661068..144de43 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -201,7 +201,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
201 | 201 | ||
202 | // Update item with new asset | 202 | // Update item with new asset |
203 | item.AssetID = asset.FullID; | 203 | item.AssetID = asset.FullID; |
204 | group.UpdateInventoryItem(item); | 204 | if (group.UpdateInventoryItem(item)) |
205 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
206 | |||
205 | part.GetProperties(remoteClient); | 207 | part.GetProperties(remoteClient); |
206 | 208 | ||
207 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) | 209 | // Trigger rerunning of script (use TriggerRezScript event, see RezScript) |
@@ -1224,7 +1226,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1224 | remoteClient, part, transactionID, currentItem); | 1226 | remoteClient, part, transactionID, currentItem); |
1225 | } | 1227 | } |
1226 | if (part.Inventory.UpdateInventoryItem(itemInfo)) | 1228 | if (part.Inventory.UpdateInventoryItem(itemInfo)) |
1229 | { | ||
1230 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | ||
1227 | part.GetProperties(remoteClient); | 1231 | part.GetProperties(remoteClient); |
1232 | } | ||
1228 | } | 1233 | } |
1229 | } | 1234 | } |
1230 | else | 1235 | else |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 2e13f90..4b9a2ad 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -630,16 +630,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
630 | { | 630 | { |
631 | item.AssetID = m_items[item.ItemID].AssetID; | 631 | item.AssetID = m_items[item.ItemID].AssetID; |
632 | } | 632 | } |
633 | else if ((InventoryType)item.Type == InventoryType.Notecard) | ||
634 | { | ||
635 | ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID); | ||
636 | |||
637 | if (presence != null) | ||
638 | { | ||
639 | presence.ControllingClient.SendAgentAlertMessage( | ||
640 | "Notecard saved", false); | ||
641 | } | ||
642 | } | ||
643 | 633 | ||
644 | m_items[item.ItemID] = item; | 634 | m_items[item.ItemID] = item; |
645 | m_inventorySerial++; | 635 | m_inventorySerial++; |