diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 862f0b7..5d77201 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
126 | return; | 126 | return; |
127 | 127 | ||
128 | // This will never run more than once, even if the region is restarted | 128 | // This will never run more than once, even if the region is restarted |
129 | if (!m_HasRunOnce) | 129 | if (!m_HasRunOnce) |
130 | { | 130 | { |
131 | LoadLibrariesFromArchives(); | 131 | LoadLibrariesFromArchives(); |
132 | //DumpLibrary(); | 132 | //DumpLibrary(); |
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
178 | InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene.InventoryService, m_MockScene.AssetService, m_MockScene.UserAccountService, uinfo, simpleName, iarFileName, false); | 178 | InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene.InventoryService, m_MockScene.AssetService, m_MockScene.UserAccountService, uinfo, simpleName, iarFileName, false); |
179 | try | 179 | try |
180 | { | 180 | { |
181 | HashSet<InventoryNodeBase> nodes = archread.Execute(); | 181 | Dictionary<UUID, InventoryNodeBase> nodes = archread.Execute(); |
182 | if (nodes != null && nodes.Count == 0) | 182 | if (nodes != null && nodes.Count == 0) |
183 | { | 183 | { |
184 | // didn't find the subfolder with the given name; place it on the top | 184 | // didn't find the subfolder with the given name; place it on the top |
@@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
188 | archread.Execute(); | 188 | archread.Execute(); |
189 | } | 189 | } |
190 | 190 | ||
191 | foreach (InventoryNodeBase node in nodes) | 191 | foreach (InventoryNodeBase node in nodes.Values) |
192 | FixPerms(node); | 192 | FixPerms(node); |
193 | } | 193 | } |
194 | catch (Exception e) | 194 | catch (Exception e) |