diff options
author | Diva Canto | 2015-08-08 12:12:50 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-08 12:12:50 -0700 |
commit | 959872315f67a1a33a2bae7330749f7dd74a4774 (patch) | |
tree | e31f6900453e77815859767cb2331d0412ec5b57 /OpenSim/Region/ClientStack/Linden/Caps/Tests | |
parent | Have osAvatarName2Key check the cache first, even for foreign users (diff) | |
download | opensim-SC-959872315f67a1a33a2bae7330749f7dd74a4774.zip opensim-SC-959872315f67a1a33a2bae7330749f7dd74a4774.tar.gz opensim-SC-959872315f67a1a33a2bae7330749f7dd74a4774.tar.bz2 opensim-SC-959872315f67a1a33a2bae7330749f7dd74a4774.tar.xz |
WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/Tests')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs index 39209ec..dd4a691 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs | |||
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ClientStack.Linden.Caps.Tests | |||
116 | PollServiceEventArgs pseArgs; | 116 | PollServiceEventArgs pseArgs; |
117 | userCaps.TryGetPollHandler("FetchInventoryDescendents2", out pseArgs); | 117 | userCaps.TryGetPollHandler("FetchInventoryDescendents2", out pseArgs); |
118 | req.UriPath = pseArgs.Url; | 118 | req.UriPath = pseArgs.Url; |
119 | req.Uri = new Uri(req.UriPath); | 119 | req.Uri = new Uri("file://" + req.UriPath); |
120 | 120 | ||
121 | // Retrieve root folder details directly so that we can request | 121 | // Retrieve root folder details directly so that we can request |
122 | InventoryFolderBase folder = scene.InventoryService.GetRootFolder(ua.PrincipalID); | 122 | InventoryFolderBase folder = scene.InventoryService.GetRootFolder(ua.PrincipalID); |
@@ -137,6 +137,8 @@ namespace OpenSim.Region.ClientStack.Linden.Caps.Tests | |||
137 | req.Body = new MemoryStream(OSDParser.SerializeLLSDXmlBytes(osdReqMap)); | 137 | req.Body = new MemoryStream(OSDParser.SerializeLLSDXmlBytes(osdReqMap)); |
138 | 138 | ||
139 | TestHttpClientContext context = new TestHttpClientContext(false); | 139 | TestHttpClientContext context = new TestHttpClientContext(false); |
140 | |||
141 | // WARNING: This results in a caught exception, because queryString is null | ||
140 | MainServer.Instance.OnRequest(context, new RequestEventArgs(req)); | 142 | MainServer.Instance.OnRequest(context, new RequestEventArgs(req)); |
141 | 143 | ||
142 | // Drive processing of the queued inventory request synchronously. | 144 | // Drive processing of the queued inventory request synchronously. |