diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index e3a9a22..53ed115 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | |||
@@ -43,7 +43,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps; | |||
43 | 43 | ||
44 | namespace OpenSim.Capabilities.Handlers | 44 | namespace OpenSim.Capabilities.Handlers |
45 | { | 45 | { |
46 | public class FetchInvDescHandler | 46 | public class FetchInvDescHandler |
47 | { | 47 | { |
48 | private static readonly ILog m_log = | 48 | private static readonly ILog m_log = |
49 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -53,14 +53,14 @@ namespace OpenSim.Capabilities.Handlers | |||
53 | private IScene m_Scene; | 53 | private IScene m_Scene; |
54 | // private object m_fetchLock = new Object(); | 54 | // private object m_fetchLock = new Object(); |
55 | 55 | ||
56 | public FetchInvDescHandler(IInventoryService invService, ILibraryService libService, IScene s) | 56 | public FetchInvDescHandler(IInventoryService invService, ILibraryService libService, IScene s) |
57 | { | 57 | { |
58 | m_InventoryService = invService; | 58 | m_InventoryService = invService; |
59 | m_LibraryService = libService; | 59 | m_LibraryService = libService; |
60 | m_Scene = s; | 60 | m_Scene = s; |
61 | } | 61 | } |
62 | 62 | ||
63 | 63 | ||
64 | public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 64 | public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
65 | { | 65 | { |
66 | //m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request); | 66 | //m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request); |
@@ -72,14 +72,14 @@ namespace OpenSim.Capabilities.Handlers | |||
72 | // correctly mark it as a uuid | 72 | // correctly mark it as a uuid |
73 | // | 73 | // |
74 | request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>"); | 74 | request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>"); |
75 | 75 | ||
76 | // another hack <integer>1</integer> results in a | 76 | // another hack <integer>1</integer> results in a |
77 | // System.ArgumentException: Object type System.Int32 cannot | 77 | // System.ArgumentException: Object type System.Int32 cannot |
78 | // be converted to target type: System.Boolean | 78 | // be converted to target type: System.Boolean |
79 | // | 79 | // |
80 | request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>"); | 80 | request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>"); |
81 | request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>"); | 81 | request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>"); |
82 | 82 | ||
83 | Hashtable hash = new Hashtable(); | 83 | Hashtable hash = new Hashtable(); |
84 | try | 84 | try |
85 | { | 85 | { |
@@ -90,9 +90,9 @@ namespace OpenSim.Capabilities.Handlers | |||
90 | m_log.ErrorFormat("[WEB FETCH INV DESC HANDLER]: Fetch error: {0}{1}" + e.Message, e.StackTrace); | 90 | m_log.ErrorFormat("[WEB FETCH INV DESC HANDLER]: Fetch error: {0}{1}" + e.Message, e.StackTrace); |
91 | m_log.Error("Request: " + request); | 91 | m_log.Error("Request: " + request); |
92 | } | 92 | } |
93 | 93 | ||
94 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | 94 | ArrayList foldersrequested = (ArrayList)hash["folders"]; |
95 | 95 | ||
96 | string response = ""; | 96 | string response = ""; |
97 | string bad_folders_response = ""; | 97 | string bad_folders_response = ""; |
98 | 98 | ||
@@ -516,7 +516,7 @@ from docs seems this was never a spec | |||
516 | // } | 516 | // } |
517 | // } | 517 | // } |
518 | // } | 518 | // } |
519 | // | 519 | // |
520 | // foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend) | 520 | // foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend) |
521 | // { | 521 | // { |
522 | // m_log.DebugFormat( | 522 | // m_log.DebugFormat( |