diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs index b295446..e90b869 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
61 | { | 61 | { |
62 | if (configName != string.Empty) | 62 | if (configName != string.Empty) |
63 | m_ConfigName = configName; | 63 | m_ConfigName = configName; |
64 | 64 | ||
65 | IConfig serverConfig = config.Configs[m_ConfigName]; | 65 | IConfig serverConfig = config.Configs[m_ConfigName]; |
66 | if (serverConfig == null) | 66 | if (serverConfig == null) |
67 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); | 67 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); |
@@ -92,7 +92,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
92 | m_httpServer.AddStreamHandler( | 92 | m_httpServer.AddStreamHandler( |
93 | new RestDeserialiseSecureHandler<Guid, InventoryCollection>( | 93 | new RestDeserialiseSecureHandler<Guid, InventoryCollection>( |
94 | "POST", "/GetFolderContent/", GetFolderContent, CheckAuthSession)); | 94 | "POST", "/GetFolderContent/", GetFolderContent, CheckAuthSession)); |
95 | 95 | ||
96 | m_httpServer.AddStreamHandler( | 96 | m_httpServer.AddStreamHandler( |
97 | new RestDeserialiseSecureHandler<InventoryFolderBase, bool>( | 97 | new RestDeserialiseSecureHandler<InventoryFolderBase, bool>( |
98 | "POST", "/UpdateFolder/", m_InventoryService.UpdateFolder, CheckAuthSession)); | 98 | "POST", "/UpdateFolder/", m_InventoryService.UpdateFolder, CheckAuthSession)); |
@@ -114,12 +114,12 @@ namespace OpenSim.Server.Handlers.Inventory | |||
114 | "POST", "/DeleteItem/", DeleteItems, CheckAuthSession)); | 114 | "POST", "/DeleteItem/", DeleteItems, CheckAuthSession)); |
115 | 115 | ||
116 | m_httpServer.AddStreamHandler( | 116 | m_httpServer.AddStreamHandler( |
117 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( | 117 | new RestDeserialiseSecureHandler<Guid, InventoryItemBase>( |
118 | "POST", "/QueryItem/", m_InventoryService.GetItem, CheckAuthSession)); | 118 | "POST", "/QueryItem/", GetItem, CheckAuthSession)); |
119 | 119 | ||
120 | m_httpServer.AddStreamHandler( | 120 | m_httpServer.AddStreamHandler( |
121 | new RestDeserialiseSecureHandler<InventoryFolderBase, InventoryFolderBase>( | 121 | new RestDeserialiseSecureHandler<Guid, InventoryFolderBase>( |
122 | "POST", "/QueryFolder/", m_InventoryService.GetFolder, CheckAuthSession)); | 122 | "POST", "/QueryFolder/", GetFolder, CheckAuthSession)); |
123 | 123 | ||
124 | m_httpServer.AddStreamHandler( | 124 | m_httpServer.AddStreamHandler( |
125 | new RestDeserialiseTrustedHandler<Guid, bool>( | 125 | new RestDeserialiseTrustedHandler<Guid, bool>( |
@@ -151,7 +151,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
151 | 151 | ||
152 | m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService)); | 152 | m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService)); |
153 | 153 | ||
154 | 154 | ||
155 | // for persistent active gestures | 155 | // for persistent active gestures |
156 | m_httpServer.AddStreamHandler( | 156 | m_httpServer.AddStreamHandler( |
157 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> | 157 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> |
@@ -205,6 +205,16 @@ namespace OpenSim.Server.Handlers.Inventory | |||
205 | return new Dictionary<AssetType, InventoryFolderBase>(); | 205 | return new Dictionary<AssetType, InventoryFolderBase>(); |
206 | } | 206 | } |
207 | 207 | ||
208 | public InventoryItemBase GetItem(Guid guid) | ||
209 | { | ||
210 | return m_InventoryService.GetItem(UUID.Zero, new UUID(guid)); | ||
211 | } | ||
212 | |||
213 | public InventoryFolderBase GetFolder(Guid guid) | ||
214 | { | ||
215 | return m_InventoryService.GetFolder(UUID.Zero, new UUID(guid)); | ||
216 | } | ||
217 | |||
208 | public InventoryCollection GetFolderContent(Guid guid) | 218 | public InventoryCollection GetFolderContent(Guid guid) |
209 | { | 219 | { |
210 | return m_InventoryService.GetFolderContent(UUID.Zero, new UUID(guid)); | 220 | return m_InventoryService.GetFolderContent(UUID.Zero, new UUID(guid)); |