diff options
author | Diva Canto | 2011-02-04 19:19:38 -0800 |
---|---|---|
committer | Diva Canto | 2011-02-04 19:19:38 -0800 |
commit | 632babf8fba8180764b359b9716eaac904b1b4ac (patch) | |
tree | 5f1d40a48dcec4a9a999c2b778d9b296e767dd23 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory | |
parent | Added a config var to HGInventoryAccessModule called OutboundPermission that ... (diff) | |
download | opensim-SC_OLD-632babf8fba8180764b359b9716eaac904b1b4ac.zip opensim-SC_OLD-632babf8fba8180764b359b9716eaac904b1b4ac.tar.gz opensim-SC_OLD-632babf8fba8180764b359b9716eaac904b1b4ac.tar.bz2 opensim-SC_OLD-632babf8fba8180764b359b9716eaac904b1b4ac.tar.xz |
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 362 |
2 files changed, 5 insertions, 362 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 39410b5..3f63db3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -200,6 +200,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
200 | return; | 200 | return; |
201 | } | 201 | } |
202 | } | 202 | } |
203 | else | ||
204 | { | ||
205 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: User {0} does not have InventoryServerURI. OH NOES!", userID); | ||
206 | return; | ||
207 | } | ||
203 | } | 208 | } |
204 | } | 209 | } |
205 | } | 210 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs deleted file mode 100644 index 9213132..0000000 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ /dev/null | |||
@@ -1,362 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using log4net; | ||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Statistics; | ||
35 | using OpenSim.Services.Connectors; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Region.Framework.Scenes; | ||
38 | using OpenSim.Services.Interfaces; | ||
39 | using OpenMetaverse; | ||
40 | |||
41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | ||
42 | { | ||
43 | public class RemoteInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService | ||
44 | { | ||
45 | private static readonly ILog m_log = | ||
46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | |||
48 | private bool m_Enabled = false; | ||
49 | private bool m_Initialized = false; | ||
50 | private Scene m_Scene; | ||
51 | private InventoryServicesConnector m_RemoteConnector; | ||
52 | |||
53 | private IUserManagement m_UserManager; | ||
54 | private IUserManagement UserManager | ||
55 | { | ||
56 | get | ||
57 | { | ||
58 | if (m_UserManager == null) | ||
59 | { | ||
60 | m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); | ||
61 | } | ||
62 | return m_UserManager; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | |||
67 | public Type ReplaceableInterface | ||
68 | { | ||
69 | get { return null; } | ||
70 | } | ||
71 | |||
72 | public string Name | ||
73 | { | ||
74 | get { return "RemoteInventoryServicesConnector"; } | ||
75 | } | ||
76 | |||
77 | public RemoteInventoryServicesConnector() | ||
78 | { | ||
79 | } | ||
80 | |||
81 | public RemoteInventoryServicesConnector(IConfigSource source) | ||
82 | { | ||
83 | Init(source); | ||
84 | } | ||
85 | |||
86 | protected override void Init(IConfigSource source) | ||
87 | { | ||
88 | m_RemoteConnector = new InventoryServicesConnector(source); | ||
89 | base.Init(source); | ||
90 | } | ||
91 | |||
92 | #region ISharedRegionModule | ||
93 | |||
94 | public void Initialise(IConfigSource source) | ||
95 | { | ||
96 | IConfig moduleConfig = source.Configs["Modules"]; | ||
97 | if (moduleConfig != null) | ||
98 | { | ||
99 | string name = moduleConfig.GetString("InventoryServices", ""); | ||
100 | if (name == Name) | ||
101 | { | ||
102 | Init(source); | ||
103 | m_Enabled = true; | ||
104 | |||
105 | m_log.Info("[INVENTORY CONNECTOR]: Remote inventory enabled"); | ||
106 | } | ||
107 | } | ||
108 | } | ||
109 | |||
110 | public void PostInitialise() | ||
111 | { | ||
112 | } | ||
113 | |||
114 | public void Close() | ||
115 | { | ||
116 | } | ||
117 | |||
118 | public void AddRegion(Scene scene) | ||
119 | { | ||
120 | // m_Scene = scene; | ||
121 | //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); | ||
122 | |||
123 | if (!m_Enabled) | ||
124 | return; | ||
125 | |||
126 | if (!m_Initialized) | ||
127 | { | ||
128 | m_Initialized = true; | ||
129 | } | ||
130 | |||
131 | scene.RegisterModuleInterface<IInventoryService>(this); | ||
132 | m_cache.AddRegion(scene); | ||
133 | |||
134 | if (m_Scene == null) | ||
135 | m_Scene = scene; | ||
136 | } | ||
137 | |||
138 | public void RemoveRegion(Scene scene) | ||
139 | { | ||
140 | if (!m_Enabled) | ||
141 | return; | ||
142 | |||
143 | m_cache.RemoveRegion(scene); | ||
144 | } | ||
145 | |||
146 | public void RegionLoaded(Scene scene) | ||
147 | { | ||
148 | if (!m_Enabled) | ||
149 | return; | ||
150 | |||
151 | m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled remote inventory for region {0}", scene.RegionInfo.RegionName); | ||
152 | |||
153 | } | ||
154 | |||
155 | #endregion ISharedRegionModule | ||
156 | |||
157 | #region IInventoryService | ||
158 | |||
159 | public override bool CreateUserInventory(UUID user) | ||
160 | { | ||
161 | return false; | ||
162 | } | ||
163 | |||
164 | public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId) | ||
165 | { | ||
166 | return new List<InventoryFolderBase>(); | ||
167 | } | ||
168 | |||
169 | public override InventoryCollection GetUserInventory(UUID userID) | ||
170 | { | ||
171 | return null; | ||
172 | } | ||
173 | |||
174 | public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | ||
175 | { | ||
176 | UUID sessionID = GetSessionID(userID); | ||
177 | try | ||
178 | { | ||
179 | m_RemoteConnector.GetUserInventory(userID.ToString(), sessionID, callback); | ||
180 | } | ||
181 | catch (Exception e) | ||
182 | { | ||
183 | if (StatsManager.SimExtraStats != null) | ||
184 | StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure(); | ||
185 | |||
186 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Request inventory operation failed, {0} {1}", | ||
187 | e.Source, e.Message); | ||
188 | } | ||
189 | |||
190 | } | ||
191 | |||
192 | // inherited. See base class | ||
193 | // public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) | ||
194 | |||
195 | public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) | ||
196 | { | ||
197 | UUID sessionID = GetSessionID(userID); | ||
198 | return m_RemoteConnector.GetSystemFolders(userID.ToString(), sessionID); | ||
199 | } | ||
200 | |||
201 | public override InventoryCollection GetFolderContent(UUID userID, UUID folderID) | ||
202 | { | ||
203 | UUID sessionID = GetSessionID(userID); | ||
204 | try | ||
205 | { | ||
206 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID.ToString(), folderID, sessionID); | ||
207 | foreach (InventoryItemBase item in invCol.Items) | ||
208 | UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData); | ||
209 | return invCol; | ||
210 | } | ||
211 | catch (Exception e) | ||
212 | { | ||
213 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1}", | ||
214 | e.Source, e.Message); | ||
215 | } | ||
216 | InventoryCollection nullCollection = new InventoryCollection(); | ||
217 | nullCollection.Folders = new List<InventoryFolderBase>(); | ||
218 | nullCollection.Items = new List<InventoryItemBase>(); | ||
219 | nullCollection.UserID = userID; | ||
220 | return nullCollection; | ||
221 | } | ||
222 | |||
223 | public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | ||
224 | { | ||
225 | UUID sessionID = GetSessionID(userID); | ||
226 | return m_RemoteConnector.GetFolderItems(userID.ToString(), folderID, sessionID); | ||
227 | } | ||
228 | |||
229 | public override bool AddFolder(InventoryFolderBase folder) | ||
230 | { | ||
231 | if (folder == null) | ||
232 | return false; | ||
233 | |||
234 | UUID sessionID = GetSessionID(folder.Owner); | ||
235 | return m_RemoteConnector.AddFolder(folder.Owner.ToString(), folder, sessionID); | ||
236 | } | ||
237 | |||
238 | public override bool UpdateFolder(InventoryFolderBase folder) | ||
239 | { | ||
240 | if (folder == null) | ||
241 | return false; | ||
242 | |||
243 | UUID sessionID = GetSessionID(folder.Owner); | ||
244 | return m_RemoteConnector.UpdateFolder(folder.Owner.ToString(), folder, sessionID); | ||
245 | } | ||
246 | |||
247 | public override bool MoveFolder(InventoryFolderBase folder) | ||
248 | { | ||
249 | if (folder == null) | ||
250 | return false; | ||
251 | |||
252 | UUID sessionID = GetSessionID(folder.Owner); | ||
253 | return m_RemoteConnector.MoveFolder(folder.Owner.ToString(), folder, sessionID); | ||
254 | } | ||
255 | |||
256 | public override bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) | ||
257 | { | ||
258 | if (folderIDs == null) | ||
259 | return false; | ||
260 | if (folderIDs.Count == 0) | ||
261 | return false; | ||
262 | |||
263 | UUID sessionID = GetSessionID(ownerID); | ||
264 | return m_RemoteConnector.DeleteFolders(ownerID.ToString(), folderIDs, sessionID); | ||
265 | } | ||
266 | |||
267 | |||
268 | public override bool PurgeFolder(InventoryFolderBase folder) | ||
269 | { | ||
270 | if (folder == null) | ||
271 | return false; | ||
272 | |||
273 | UUID sessionID = GetSessionID(folder.Owner); | ||
274 | return m_RemoteConnector.PurgeFolder(folder.Owner.ToString(), folder, sessionID); | ||
275 | } | ||
276 | |||
277 | // public bool AddItem(InventoryItemBase item) inherited | ||
278 | // Uses AddItemPlain | ||
279 | |||
280 | protected override bool AddItemPlain(InventoryItemBase item) | ||
281 | { | ||
282 | if (item == null) | ||
283 | return false; | ||
284 | |||
285 | UUID sessionID = GetSessionID(item.Owner); | ||
286 | return m_RemoteConnector.AddItem(item.Owner.ToString(), item, sessionID); | ||
287 | } | ||
288 | |||
289 | public override bool UpdateItem(InventoryItemBase item) | ||
290 | { | ||
291 | if (item == null) | ||
292 | return false; | ||
293 | |||
294 | UUID sessionID = GetSessionID(item.Owner); | ||
295 | return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID); | ||
296 | } | ||
297 | |||
298 | public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items) | ||
299 | { | ||
300 | if (items == null) | ||
301 | return false; | ||
302 | |||
303 | UUID sessionID = GetSessionID(ownerID); | ||
304 | return m_RemoteConnector.MoveItems(ownerID.ToString(), items, sessionID); | ||
305 | } | ||
306 | |||
307 | |||
308 | public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs) | ||
309 | { | ||
310 | if (itemIDs == null) | ||
311 | return false; | ||
312 | if (itemIDs.Count == 0) | ||
313 | return true; | ||
314 | |||
315 | UUID sessionID = GetSessionID(ownerID); | ||
316 | return m_RemoteConnector.DeleteItems(ownerID.ToString(), itemIDs, sessionID); | ||
317 | } | ||
318 | |||
319 | public override InventoryItemBase GetItem(InventoryItemBase item) | ||
320 | { | ||
321 | if (item == null) | ||
322 | return null; | ||
323 | |||
324 | UUID sessionID = GetSessionID(item.Owner); | ||
325 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); | ||
326 | } | ||
327 | |||
328 | public override InventoryFolderBase GetFolder(InventoryFolderBase folder) | ||
329 | { | ||
330 | if (folder == null) | ||
331 | return null; | ||
332 | |||
333 | UUID sessionID = GetSessionID(folder.Owner); | ||
334 | return m_RemoteConnector.QueryFolder(folder.Owner.ToString(), folder, sessionID); | ||
335 | } | ||
336 | |||
337 | public override bool HasInventoryForUser(UUID userID) | ||
338 | { | ||
339 | return false; | ||
340 | } | ||
341 | |||
342 | public override List<InventoryItemBase> GetActiveGestures(UUID userId) | ||
343 | { | ||
344 | return new List<InventoryItemBase>(); | ||
345 | } | ||
346 | |||
347 | public override int GetAssetPermissions(UUID userID, UUID assetID) | ||
348 | { | ||
349 | UUID sessionID = GetSessionID(userID); | ||
350 | return m_RemoteConnector.GetAssetPermissions(userID.ToString(), assetID, sessionID); | ||
351 | } | ||
352 | |||
353 | |||
354 | #endregion | ||
355 | |||
356 | private UUID GetSessionID(UUID userID) | ||
357 | { | ||
358 | return UUID.Zero; | ||
359 | } | ||
360 | |||
361 | } | ||
362 | } | ||