diff options
| author | Diva Canto | 2010-06-09 10:55:37 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-09 10:55:37 -0700 |
| commit | 8fc5eda2c913ea24125623ae4e529544417ee42a (patch) | |
| tree | aa04d9a02555bc46080e31d86caf522738689d29 /OpenSim | |
| parent | Give attachments the same priority as other avatars in BestAvatarResponsiveness (diff) | |
| download | opensim-SC-8fc5eda2c913ea24125623ae4e529544417ee42a.zip opensim-SC-8fc5eda2c913ea24125623ae4e529544417ee42a.tar.gz opensim-SC-8fc5eda2c913ea24125623ae4e529544417ee42a.tar.bz2 opensim-SC-8fc5eda2c913ea24125623ae4e529544417ee42a.tar.xz | |
Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index cc7b648..4180d5e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1736,7 +1736,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1736 | item.AssetType = asset.Type; | 1736 | item.AssetType = asset.Type; |
| 1737 | item.InvType = (int)InventoryType.Object; | 1737 | item.InvType = (int)InventoryType.Object; |
| 1738 | 1738 | ||
| 1739 | item.Folder = UUID.Zero; // Objects folder! | 1739 | InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object); |
| 1740 | if (folder != null) | ||
| 1741 | item.Folder = folder.ID; | ||
| 1742 | else // oopsies | ||
| 1743 | item.Folder = UUID.Zero; | ||
| 1740 | 1744 | ||
| 1741 | if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions()) | 1745 | if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions()) |
| 1742 | { | 1746 | { |