aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-04-21 19:51:17 +0100
committerMelanie2010-04-21 19:51:17 +0100
commitaf778f09d568ec3c95f6815450f6ab2c073bd830 (patch)
tree60371db96c16836984e44a15791cdf5f005e03ef /OpenSim/Region/Framework
parentAvoid duplicate script resumes. Move resume calls to more logical places (diff)
parentMake the detection cone in attachments face in the direction of the avatar, (diff)
downloadopensim-SC_OLD-af778f09d568ec3c95f6815450f6ab2c073bd830.zip
opensim-SC_OLD-af778f09d568ec3c95f6815450f6ab2c073bd830.tar.gz
opensim-SC_OLD-af778f09d568ec3c95f6815450f6ab2c073bd830.tar.bz2
opensim-SC_OLD-af778f09d568ec3c95f6815450f6ab2c073bd830.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
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 2f1a189..e6e414f 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)
@@ -1229,7 +1231,10 @@ namespace OpenSim.Region.Framework.Scenes
1229 remoteClient, part, transactionID, currentItem); 1231 remoteClient, part, transactionID, currentItem);
1230 } 1232 }
1231 if (part.Inventory.UpdateInventoryItem(itemInfo)) 1233 if (part.Inventory.UpdateInventoryItem(itemInfo))
1234 {
1235 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1232 part.GetProperties(remoteClient); 1236 part.GetProperties(remoteClient);
1237 }
1233 } 1238 }
1234 } 1239 }
1235 else 1240 else