diff options
| author | Melanie | 2010-01-04 06:17:38 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 06:17:38 +0000 |
| commit | d657b76dba39a9cb5e37f7f86056893e39e8a3f9 (patch) | |
| tree | e76f5c9177496038984afa7c4eb04fb093d475fc /OpenSim/Region/Framework/Scenes | |
| parent | Solve conflict (diff) | |
| parent | When rezzing a no-copy object on a no-rez parcel, the object vanishes from (diff) | |
| download | opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.zip opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.gz opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.bz2 opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index bce7d32..18ec25f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2056,6 +2056,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2056 | group.Children.Count, remoteClient.AgentId, pos) | 2056 | group.Children.Count, remoteClient.AgentId, pos) |
| 2057 | && !attachment) | 2057 | && !attachment) |
| 2058 | { | 2058 | { |
| 2059 | // The client operates in no fail mode. It will | ||
| 2060 | // have already removed the item from the folder | ||
| 2061 | // if it's no copy. | ||
| 2062 | // Put it back if it's not an attachment | ||
| 2063 | // | ||
| 2064 | if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment)) | ||
| 2065 | remoteClient.SendBulkUpdateInventory(item); | ||
| 2059 | return null; | 2066 | return null; |
| 2060 | } | 2067 | } |
| 2061 | 2068 | ||