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 | |
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 'OpenSim/Region/CoreModules/Framework/Library')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs | 48 |
2 files changed, 33 insertions, 21 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 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs index 49589fd..e1e1838 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
65 | { | 65 | { |
66 | InventoryFolderImpl folder = null; | 66 | InventoryFolderImpl folder = null; |
67 | InventoryCollection inv = new InventoryCollection(); | 67 | InventoryCollection inv = new InventoryCollection(); |
68 | inv.UserID = m_Library.Owner; | 68 | inv.OwnerID = m_Library.Owner; |
69 | 69 | ||
70 | if (folderID != m_Library.ID) | 70 | if (folderID != m_Library.ID) |
71 | { | 71 | { |
@@ -87,6 +87,34 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
87 | return inv; | 87 | return inv; |
88 | } | 88 | } |
89 | 89 | ||
90 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) | ||
91 | { | ||
92 | InventoryCollection[] invColl = new InventoryCollection[folderIDs.Length]; | ||
93 | int i = 0; | ||
94 | foreach (UUID fid in folderIDs) | ||
95 | { | ||
96 | invColl[i++] = GetFolderContent(principalID, fid); | ||
97 | } | ||
98 | |||
99 | return invColl; | ||
100 | } | ||
101 | |||
102 | public virtual InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs) | ||
103 | { | ||
104 | InventoryItemBase[] itemColl = new InventoryItemBase[itemIDs.Length]; | ||
105 | int i = 0; | ||
106 | InventoryItemBase item = new InventoryItemBase(); | ||
107 | item.Owner = principalID; | ||
108 | foreach (UUID fid in itemIDs) | ||
109 | { | ||
110 | item.ID = fid; | ||
111 | itemColl[i++] = GetItem(item); | ||
112 | } | ||
113 | |||
114 | return itemColl; | ||
115 | } | ||
116 | |||
117 | |||
90 | /// <summary> | 118 | /// <summary> |
91 | /// Add a new folder to the user's inventory | 119 | /// Add a new folder to the user's inventory |
92 | /// </summary> | 120 | /// </summary> |
@@ -142,28 +170,12 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
142 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) { return null; } | 170 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) { return null; } |
143 | 171 | ||
144 | /// <summary> | 172 | /// <summary> |
145 | /// Synchronous inventory fetch. | ||
146 | /// </summary> | ||
147 | /// <param name="userID"></param> | ||
148 | /// <returns></returns> | ||
149 | public InventoryCollection GetUserInventory(UUID userID) { return null; } | ||
150 | |||
151 | /// <summary> | ||
152 | /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the | ||
153 | /// inventory has been received | ||
154 | /// </summary> | ||
155 | /// <param name="userID"></param> | ||
156 | /// <param name="callback"></param> | ||
157 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) { } | ||
158 | |||
159 | |||
160 | /// <summary> | ||
161 | /// Gets the user folder for the given folder-type | 173 | /// Gets the user folder for the given folder-type |
162 | /// </summary> | 174 | /// </summary> |
163 | /// <param name="userID"></param> | 175 | /// <param name="userID"></param> |
164 | /// <param name="type"></param> | 176 | /// <param name="type"></param> |
165 | /// <returns></returns> | 177 | /// <returns></returns> |
166 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) { return null; } | 178 | public InventoryFolderBase GetFolderForType(UUID userID, FolderType type) { return null; } |
167 | 179 | ||
168 | 180 | ||
169 | /// <summary> | 181 | /// <summary> |