diff options
| author | Melanie | 2010-01-04 06:16:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 06:16:04 +0000 |
| commit | 374077547226014f00a021756b8e9c357d017264 (patch) | |
| tree | 4320e5f5a919225f96aec5f2d52e0ae0ee0a8c87 | |
| parent | Mark GetUserInventory as obsolete. It is still used in the default (diff) | |
| download | opensim-SC_OLD-374077547226014f00a021756b8e9c357d017264.zip opensim-SC_OLD-374077547226014f00a021756b8e9c357d017264.tar.gz opensim-SC_OLD-374077547226014f00a021756b8e9c357d017264.tar.bz2 opensim-SC_OLD-374077547226014f00a021756b8e9c357d017264.tar.xz | |
When rezzing a no-copy object on a no-rez parcel, the object vanishes from
inventory until relog. This patch corrects this and puts the item back into
inventory.
| -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 89ce4ae..3044017 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2052,6 +2052,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2052 | group.Children.Count, remoteClient.AgentId, pos) | 2052 | group.Children.Count, remoteClient.AgentId, pos) |
| 2053 | && !attachment) | 2053 | && !attachment) |
| 2054 | { | 2054 | { |
| 2055 | // The client operates in no fail mode. It will | ||
| 2056 | // have already removed the item from the folder | ||
| 2057 | // if it's no copy. | ||
| 2058 | // Put it back if it's not an attachment | ||
| 2059 | // | ||
| 2060 | if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment)) | ||
| 2061 | remoteClient.SendBulkUpdateInventory(item); | ||
| 2055 | return null; | 2062 | return null; |
| 2056 | } | 2063 | } |
| 2057 | 2064 | ||