aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
authorJohn Hurliman2010-06-11 15:43:22 -0700
committerJohn Hurliman2010-06-11 15:43:22 -0700
commitb5bc2816fc43d1b5d2c54c90c8135eab7b0a72be (patch)
tree95db3efbd631a46c2006fc94dd5ed869ccfcc61a /OpenSim/Services/Connectors/SimianGrid
parent* Added a new method to IMapImageGenerator for getting the map tile before it... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.zip
opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.gz
opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.bz2
opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 6bf43d5..dc68259 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -314,11 +314,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
314 m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); 314 m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found");
315 return null; 315 return null;
316 } 316 }
317
318 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
319 {
320 return GetFolder(new InventoryFolderBase(folderId, userId));
321 }
322 317
323 /// <summary> 318 /// <summary>
324 /// Get a folder, given by its UUID 319 /// Get a folder, given by its UUID