diff options
author | Oren Hurvitz | 2014-04-23 08:17:25 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 14:38:33 +0100 |
commit | 018832522c3c5e37f027bade05c93b88d6ca3827 (patch) | |
tree | ff5b67195e19263505140c121920e6a6be3b4ddc /OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |
parent | Eliminated 'Obsolete' warning: don't call do-nothing function SetPreviousAppe... (diff) | |
download | opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.zip opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.tar.gz opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.tar.bz2 opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.tar.xz |
Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 5df3dda..ce975a8 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -114,8 +114,6 @@ namespace OpenSim.Server.Handlers.Asset | |||
114 | return HandleCreateUserInventory(request); | 114 | return HandleCreateUserInventory(request); |
115 | case "GETINVENTORYSKELETON": | 115 | case "GETINVENTORYSKELETON": |
116 | return HandleGetInventorySkeleton(request); | 116 | return HandleGetInventorySkeleton(request); |
117 | case "GETUSERINVENTORY": | ||
118 | return HandleGetUserInventory(request); | ||
119 | case "GETROOTFOLDER": | 117 | case "GETROOTFOLDER": |
120 | return HandleGetRootFolder(request); | 118 | return HandleGetRootFolder(request); |
121 | case "GETFOLDERFORTYPE": | 119 | case "GETFOLDERFORTYPE": |
@@ -250,45 +248,6 @@ namespace OpenSim.Server.Handlers.Asset | |||
250 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); | 248 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
251 | } | 249 | } |
252 | 250 | ||
253 | byte[] HandleGetUserInventory(Dictionary<string, object> request) | ||
254 | { | ||
255 | Dictionary<string, object> result = new Dictionary<string, object>(); | ||
256 | UUID principal = UUID.Zero; | ||
257 | UUID.TryParse(request["PRINCIPAL"].ToString(), out principal); | ||
258 | |||
259 | InventoryCollection icoll = m_InventoryService.GetUserInventory(principal); | ||
260 | if (icoll != null) | ||
261 | { | ||
262 | Dictionary<string, object> folders = new Dictionary<string, object>(); | ||
263 | int i = 0; | ||
264 | if (icoll.Folders != null) | ||
265 | { | ||
266 | foreach (InventoryFolderBase f in icoll.Folders) | ||
267 | { | ||
268 | folders["folder_" + i.ToString()] = EncodeFolder(f); | ||
269 | i++; | ||
270 | } | ||
271 | result["FOLDERS"] = folders; | ||
272 | } | ||
273 | if (icoll.Items != null) | ||
274 | { | ||
275 | i = 0; | ||
276 | Dictionary<string, object> items = new Dictionary<string, object>(); | ||
277 | foreach (InventoryItemBase it in icoll.Items) | ||
278 | { | ||
279 | items["item_" + i.ToString()] = EncodeItem(it); | ||
280 | i++; | ||
281 | } | ||
282 | result["ITEMS"] = items; | ||
283 | } | ||
284 | } | ||
285 | |||
286 | string xmlString = ServerUtils.BuildXmlResponse(result); | ||
287 | |||
288 | //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); | ||
289 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); | ||
290 | } | ||
291 | |||
292 | byte[] HandleGetRootFolder(Dictionary<string,object> request) | 251 | byte[] HandleGetRootFolder(Dictionary<string,object> request) |
293 | { | 252 | { |
294 | Dictionary<string,object> result = new Dictionary<string,object>(); | 253 | Dictionary<string,object> result = new Dictionary<string,object>(); |