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/Scenes/Scene.Inventory.cs | |
parent | If a transfer request is received for a task inventory item asset, then route... (diff) | |
download | opensim-SC-524a2a9e26794e2ed645d51c089be42633a782df.zip opensim-SC-524a2a9e26794e2ed645d51c089be42633a782df.tar.gz opensim-SC-524a2a9e26794e2ed645d51c089be42633a782df.tar.bz2 opensim-SC-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 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 6 insertions, 1 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 |