diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
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 ec22146..862f0b7 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -30,7 +30,6 @@ using System.IO; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | 31 | ||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications; | ||
34 | 33 | ||
35 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; | 34 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; |
36 | using OpenSim.Region.Framework; | 35 | using OpenSim.Region.Framework; |
@@ -43,6 +42,7 @@ using OpenMetaverse; | |||
43 | using log4net; | 42 | using log4net; |
44 | using Mono.Addins; | 43 | using Mono.Addins; |
45 | using Nini.Config; | 44 | using Nini.Config; |
45 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
46 | 46 | ||
47 | namespace OpenSim.Region.CoreModules.Framework.Library | 47 | namespace OpenSim.Region.CoreModules.Framework.Library |
48 | { | 48 | { |
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
175 | m_log.InfoFormat("[LIBRARY MODULE]: Loading library archive {0} ({1})...", iarFileName, simpleName); | 175 | m_log.InfoFormat("[LIBRARY MODULE]: Loading library archive {0} ({1})...", iarFileName, simpleName); |
176 | simpleName = GetInventoryPathFromName(simpleName); | 176 | simpleName = GetInventoryPathFromName(simpleName); |
177 | 177 | ||
178 | InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene, 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 | HashSet<InventoryNodeBase> nodes = archread.Execute(); |
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
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 |
185 | m_log.InfoFormat("[LIBRARY MODULE]: Didn't find {0} in library. Placing archive on the top level", simpleName); | 185 | m_log.InfoFormat("[LIBRARY MODULE]: Didn't find {0} in library. Placing archive on the top level", simpleName); |
186 | archread.Close(); | 186 | archread.Close(); |
187 | archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false); | 187 | archread = new InventoryArchiveReadRequest(m_MockScene.InventoryService, m_MockScene.AssetService, m_MockScene.UserAccountService, uinfo, "/", iarFileName, false); |
188 | archread.Execute(); | 188 | archread.Execute(); |
189 | } | 189 | } |
190 | 190 | ||