diff options
author | Justin Clark-Casey (justincc) | 2011-06-29 00:54:31 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-29 00:54:53 +0100 |
commit | 3f0b8db0c18afaa44fa2f6b453d60bec34a3cd98 (patch) | |
tree | 9c4b9cef0535136660d1cb5ba3e0d2e79a191783 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Hack around with the NPC module to get osNpcCreate() partially working again. (diff) | |
download | opensim-SC_OLD-3f0b8db0c18afaa44fa2f6b453d60bec34a3cd98.zip opensim-SC_OLD-3f0b8db0c18afaa44fa2f6b453d60bec34a3cd98.tar.gz opensim-SC_OLD-3f0b8db0c18afaa44fa2f6b453d60bec34a3cd98.tar.bz2 opensim-SC_OLD-3f0b8db0c18afaa44fa2f6b453d60bec34a3cd98.tar.xz |
If an inventory link target is in the same folder as the source, then don't recursively request that folder.
Currently, this should never actually happen but certainly best to handle this case
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index f37f94a..8453d35 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1341,7 +1341,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1341 | 1341 | ||
1342 | // Take care of genuinely broken links where the target doesn't exist | 1342 | // Take care of genuinely broken links where the target doesn't exist |
1343 | if (linkedItem != null) | 1343 | if (linkedItem != null) |
1344 | linkedItemFolderIdsToSend.Add(linkedItem.Folder); | 1344 | { |
1345 | // We don't need to send the folder if source and destination of the link are in the same | ||
1346 | // folder. | ||
1347 | if (linkedItem.Folder != containingFolder.ID) | ||
1348 | linkedItemFolderIdsToSend.Add(linkedItem.Folder); | ||
1349 | } | ||
1345 | } | 1350 | } |
1346 | } | 1351 | } |
1347 | 1352 | ||