diff options
| author | Melanie Thielker | 2009-03-23 00:11:34 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-03-23 00:11:34 +0000 |
| commit | 412112acbafa6e1f111b12007fd3a81728d0b2f5 (patch) | |
| tree | e7c8b2d89c8c01d95049c3b57b925d9f31cb61e8 /OpenSim/Region/Framework | |
| parent | Send proper creation date on item gives, so objects will appear at the top of (diff) | |
| download | opensim-SC-412112acbafa6e1f111b12007fd3a81728d0b2f5.zip opensim-SC-412112acbafa6e1f111b12007fd3a81728d0b2f5.tar.gz opensim-SC-412112acbafa6e1f111b12007fd3a81728d0b2f5.tar.bz2 opensim-SC-412112acbafa6e1f111b12007fd3a81728d0b2f5.tar.xz | |
Committing partial work on passing folders across instances. This may crash.
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 9528114..d129b93 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -618,6 +618,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 618 | return null; | 618 | return null; |
| 619 | } | 619 | } |
| 620 | 620 | ||
| 621 | if (!recipientUserInfo.HasReceivedInventory) | ||
| 622 | { | ||
| 623 | recipientUserInfo.FetchInventory(); | ||
| 624 | if (!WaitForInventory(recipientUserInfo)) | ||
| 625 | return null; | ||
| 626 | } | ||
| 627 | |||
| 621 | if (recipientParentFolderId == UUID.Zero) | 628 | if (recipientParentFolderId == UUID.Zero) |
| 622 | recipientParentFolderId = recipientUserInfo.RootFolder.ID; | 629 | recipientParentFolderId = recipientUserInfo.RootFolder.ID; |
| 623 | 630 | ||