diff options
| author | Justin Clark-Casey (justincc) | 2010-06-11 21:18:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-11 21:18:53 +0100 |
| commit | 8531da37d44e11e295f7c738c721285722745e45 (patch) | |
| tree | d3b564300cefb0de632fa0eadfaed57772c2832e /OpenSim/Region/Framework | |
| parent | create inactive test for iar folders/items merged with existing paths (diff) | |
| parent | Reinstated the check on im.binaryBucket.Length, this time on the local handle... (diff) | |
| download | opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.zip opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.gz opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.bz2 opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
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 4180d5e..64bdc99 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -203,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 203 | // Update item with new asset | 203 | // Update item with new asset |
| 204 | item.AssetID = asset.FullID; | 204 | item.AssetID = asset.FullID; |
| 205 | if (group.UpdateInventoryItem(item)) | 205 | if (group.UpdateInventoryItem(item)) |
| 206 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 206 | remoteClient.SendAgentAlertMessage("Script saved", false); |
| 207 | 207 | ||
| 208 | part.GetProperties(remoteClient); | 208 | part.GetProperties(remoteClient); |
| 209 | 209 | ||