aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-06-11 20:35:00 +0100
committerMelanie2010-06-11 20:35:00 +0100
commit1cfebca48df52e9d3274eeb0a3f2f80abd972b10 (patch)
tree1319585e2a1245fd4d6af0da04d169eaab771b79 /OpenSim/Region/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-1cfebca48df52e9d3274eeb0a3f2f80abd972b10.zip
opensim-SC-1cfebca48df52e9d3274eeb0a3f2f80abd972b10.tar.gz
opensim-SC-1cfebca48df52e9d3274eeb0a3f2f80abd972b10.tar.bz2
opensim-SC-1cfebca48df52e9d3274eeb0a3f2f80abd972b10.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8847043..5e1798b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.Framework.Scenes
219 // Update item with new asset 219 // Update item with new asset
220 item.AssetID = asset.FullID; 220 item.AssetID = asset.FullID;
221 if (group.UpdateInventoryItem(item)) 221 if (group.UpdateInventoryItem(item))
222 remoteClient.SendAgentAlertMessage("Notecard saved", false); 222 remoteClient.SendAgentAlertMessage("Script saved", false);
223 223
224 part.GetProperties(remoteClient); 224 part.GetProperties(remoteClient);
225 225