diff options
author | Justin Clark-Casey (justincc) | 2011-06-29 00:56:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-29 00:56:35 +0100 |
commit | 1b4c08730e068a6554befda6af728eeeea174830 (patch) | |
tree | 340b098e9b420d7c5189d1a6f33986b7ca02853d | |
parent | If an inventory link target is in the same folder as the source, then don't r... (diff) | |
download | opensim-SC_OLD-1b4c08730e068a6554befda6af728eeeea174830.zip opensim-SC_OLD-1b4c08730e068a6554befda6af728eeeea174830.tar.gz opensim-SC_OLD-1b4c08730e068a6554befda6af728eeeea174830.tar.bz2 opensim-SC_OLD-1b4c08730e068a6554befda6af728eeeea174830.tar.xz |
refactor: simplify redundant double containing folder check
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8453d35..07507b2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1328 | // m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}", | 1328 | // m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}", |
1329 | // contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName); | 1329 | // contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName); |
1330 | 1330 | ||
1331 | if (containingFolder != null && containingFolder != null) | 1331 | if (containingFolder != null) |
1332 | { | 1332 | { |
1333 | // If the folder requested contains links, then we need to send those folders first, otherwise the links | 1333 | // If the folder requested contains links, then we need to send those folders first, otherwise the links |
1334 | // will be broken in the viewer. | 1334 | // will be broken in the viewer. |
@@ -1353,7 +1353,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1353 | foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend) | 1353 | foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend) |
1354 | SendInventoryUpdate(client, new InventoryFolderBase(linkedItemFolderId), false, true); | 1354 | SendInventoryUpdate(client, new InventoryFolderBase(linkedItemFolderId), false, true); |
1355 | 1355 | ||
1356 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems); | 1356 | client.SendInventoryFolderDetails( |
1357 | client.AgentId, folder.ID, contents.Items, contents.Folders, | ||
1358 | containingFolder.Version, fetchFolders, fetchItems); | ||
1357 | } | 1359 | } |
1358 | } | 1360 | } |
1359 | 1361 | ||