aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs10
3 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 012d581..d30e954 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -181,7 +181,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
181 Manager.MyScene.AssetService.Store(asset); 181 Manager.MyScene.AssetService.Store(asset);
182 182
183 if (part.Inventory.UpdateInventoryItem(item)) 183 if (part.Inventory.UpdateInventoryItem(item))
184 {
185 remoteClient.SendAgentAlertMessage("Notecard saved", false);
184 part.GetProperties(remoteClient); 186 part.GetProperties(remoteClient);
187 }
185 } 188 }
186 } 189 }
187 } 190 }
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++;