aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-23 23:25:36 +0100
committerJustin Clark-Casey (justincc)2010-08-23 23:25:36 +0100
commitc72d298202699931fd67c981fa10b9280d02686f (patch)
tree57174404a61eb105918a0827b2c4c666487cc84c
parentminor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs (diff)
downloadopensim-SC_OLD-c72d298202699931fd67c981fa10b9280d02686f.zip
opensim-SC_OLD-c72d298202699931fd67c981fa10b9280d02686f.tar.gz
opensim-SC_OLD-c72d298202699931fd67c981fa10b9280d02686f.tar.bz2
opensim-SC_OLD-c72d298202699931fd67c981fa10b9280d02686f.tar.xz
Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs17
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 34205e3..7ac3bb9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -228,6 +228,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
228 { 228 {
229 if (item == null) 229 if (item == null)
230 return false; 230 return false;
231
232 if (UUID.Zero == item.Folder)
233 {
234 InventoryFolderBase f = m_RemoteConnector.GetFolderForType(item.Owner, (AssetType)item.AssetType);
235 if (f != null)
236 {
237 item.Folder = f.ID;
238 }
239 else
240 {
241 f = m_RemoteConnector.GetRootFolder(item.Owner);
242 if (f != null)
243 item.Folder = f.ID;
244 else
245 return false;
246 }
247 }
231 248
232 return m_RemoteConnector.AddItem(item); 249 return m_RemoteConnector.AddItem(item);
233 } 250 }