aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-07-14 11:02:41 -0700
committerDiva Canto2010-07-14 11:02:41 -0700
commit12858122d5fdda6b07841f86398230b0620d97c9 (patch)
tree74f3d2af2ab8091b602448c7e60cb8abb146de34
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-12858122d5fdda6b07841f86398230b0620d97c9.zip
opensim-SC_OLD-12858122d5fdda6b07841f86398230b0620d97c9.tar.gz
opensim-SC_OLD-12858122d5fdda6b07841f86398230b0620d97c9.tar.bz2
opensim-SC_OLD-12858122d5fdda6b07841f86398230b0620d97c9.tar.xz
Fixes mantis #4870.
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
2 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index d30e954..3d6e7f3 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -182,7 +182,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
182 182
183 if (part.Inventory.UpdateInventoryItem(item)) 183 if (part.Inventory.UpdateInventoryItem(item))
184 { 184 {
185 remoteClient.SendAgentAlertMessage("Notecard saved", false); 185 if ((InventoryType)item.InvType == InventoryType.Notecard)
186 remoteClient.SendAgentAlertMessage("Notecard saved", false);
187 else if ((InventoryType)item.InvType == InventoryType.LSL)
188 remoteClient.SendAgentAlertMessage("Script saved", false);
189 else
190 remoteClient.SendAgentAlertMessage("Item saved", false);
191
186 part.GetProperties(remoteClient); 192 part.GetProperties(remoteClient);
187 } 193 }
188 } 194 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2578685..6e73fe9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1343,7 +1343,13 @@ namespace OpenSim.Region.Framework.Scenes
1343 } 1343 }
1344 if (part.Inventory.UpdateInventoryItem(itemInfo)) 1344 if (part.Inventory.UpdateInventoryItem(itemInfo))
1345 { 1345 {
1346 remoteClient.SendAgentAlertMessage("Notecard saved", false); 1346 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1347 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1348 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1349 remoteClient.SendAgentAlertMessage("Script saved", false);
1350 else
1351 remoteClient.SendAgentAlertMessage("Item saved", false);
1352
1347 part.GetProperties(remoteClient); 1353 part.GetProperties(remoteClient);
1348 } 1354 }
1349 } 1355 }