aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2010-06-11 15:43:22 -0700
committerJohn Hurliman2010-06-11 15:43:22 -0700
commitb5bc2816fc43d1b5d2c54c90c8135eab7b0a72be (patch)
tree95db3efbd631a46c2006fc94dd5ed869ccfcc61a /OpenSim
parent* Added a new method to IMapImageGenerator for getting the map tile before it... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.zip
opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.gz
opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.bz2
opensim-SC_OLD-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs4
-rw-r--r--OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs15
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs17
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs28
-rw-r--r--OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs7
-rw-r--r--OpenSim/Services/Interfaces/IInventoryService.cs8
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs17
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/MockInventoryService.cs5
15 files changed, 23 insertions, 111 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index d003d2d..00bd27a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -575,9 +575,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
575 itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 575 itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
576 new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>()); 576 new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>());
577 577
578 InventoryFolderBase folder1Post = scene.InventoryService.GetFolder(folder1.ID, ua1.PrincipalID); 578 InventoryFolderBase folder1Post
579 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
579 Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID)); 580 Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
580
581 /* 581 /*
582 InventoryFolderBase folder2 582 InventoryFolderBase folder2
583 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b"); 583 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index 112ccd8..49589fd 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -229,14 +229,12 @@ namespace OpenSim.Region.CoreModules.Framework.Library
229 /// <returns></returns> 229 /// <returns></returns>
230 public InventoryItemBase GetItem(InventoryItemBase item) { return null; } 230 public InventoryItemBase GetItem(InventoryItemBase item) { return null; }
231 231
232 public InventoryFolderBase GetFolder(UUID folderId, UUID userId) { return null; }
233
234 /// <summary> 232 /// <summary>
235 /// Get a folder, given by its UUID 233 /// Get a folder, given by its UUID
236 /// </summary> 234 /// </summary>
237 /// <param name="folder"></param> 235 /// <param name="folder"></param>
238 /// <returns></returns> 236 /// <returns></returns>
239 public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; } 237 public InventoryFolderBase GetFolder(InventoryFolderBase folder) { return null; }
240 238
241 /// <summary> 239 /// <summary>
242 /// Does the given user have an inventory structure? 240 /// Does the given user have an inventory structure?
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
index 5b13d58..1e51187 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -205,8 +205,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
205 205
206 public abstract InventoryItemBase GetItem(InventoryItemBase item); 206 public abstract InventoryItemBase GetItem(InventoryItemBase item);
207 207
208 public abstract InventoryFolderBase GetFolder(UUID folderId, UUID userId);
209
210 public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder); 208 public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
211 209
212 /// <summary> 210 /// <summary>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index fc30347..e09db15 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
470 return connector.DeleteItems(ownerID, itemIDs); 470 return connector.DeleteItems(ownerID, itemIDs);
471 } 471 }
472 472
473 public InventoryItemBase GetItem(InventoryItemBase item) 473 public InventoryItemBase GetItem(InventoryItemBase item)
474 { 474 {
475 if (item == null) 475 if (item == null)
476 return null; 476 return null;
@@ -486,12 +486,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
486 return connector.GetItem(item); 486 return connector.GetItem(item);
487 } 487 }
488 488
489 public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 489 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
490 {
491 return GetFolder(new InventoryFolderBase(folderId, userId));
492 }
493
494 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
495 { 490 {
496 if (folder == null) 491 if (folder == null)
497 return null; 492 return null;
@@ -508,12 +503,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
508 return connector.GetFolder(folder); 503 return connector.GetFolder(folder);
509 } 504 }
510 505
511 public bool HasInventoryForUser(UUID userID) 506 public bool HasInventoryForUser(UUID userID)
512 { 507 {
513 return false; 508 return false;
514 } 509 }
515 510
516 public List<InventoryItemBase> GetActiveGestures(UUID userId) 511 public List<InventoryItemBase> GetActiveGestures(UUID userId)
517 { 512 {
518 return new List<InventoryItemBase>(); 513 return new List<InventoryItemBase>();
519 } 514 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 76be791..22bd04c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -267,11 +267,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
267 return item; 267 return item;
268 } 268 }
269 269
270 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
271 {
272 return GetFolder(new InventoryFolderBase(folderId, userId));
273 }
274
275 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 270 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
276 { 271 {
277 return m_InventoryService.GetFolder(folder); 272 return m_InventoryService.GetFolder(folder);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 6d43280..aa3b30d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -307,11 +307,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
307 return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); 307 return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
308 } 308 }
309 309
310 public override InventoryFolderBase GetFolder(UUID folderId, UUID userId)
311 {
312 return GetFolder(new InventoryFolderBase(folderId, userId));
313 }
314
315 public override InventoryFolderBase GetFolder(InventoryFolderBase folder) 310 public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
316 { 311 {
317 if (folder == null) 312 if (folder == null)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index b1e21a1..277060d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
250 } 250 }
251 251
252 252
253 public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) 253 public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
254 { 254 {
255 if (itemIDs == null) 255 if (itemIDs == null)
256 return false; 256 return false;
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
260 return m_RemoteConnector.DeleteItems(ownerID, itemIDs); 260 return m_RemoteConnector.DeleteItems(ownerID, itemIDs);
261 } 261 }
262 262
263 public InventoryItemBase GetItem(InventoryItemBase item) 263 public InventoryItemBase GetItem(InventoryItemBase item)
264 { 264 {
265 m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); 265 m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID);
266 if (item == null) 266 if (item == null)
@@ -271,12 +271,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
271 return m_RemoteConnector.GetItem(item); 271 return m_RemoteConnector.GetItem(item);
272 } 272 }
273 273
274 public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 274 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
275 {
276 return GetFolder(new InventoryFolderBase(folderId, userId));
277 }
278
279 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
280 { 275 {
281 m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); 276 m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
282 if (folder == null) 277 if (folder == null)
@@ -285,17 +280,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
285 return m_RemoteConnector.GetFolder(folder); 280 return m_RemoteConnector.GetFolder(folder);
286 } 281 }
287 282
288 public bool HasInventoryForUser(UUID userID) 283 public bool HasInventoryForUser(UUID userID)
289 { 284 {
290 return false; 285 return false;
291 } 286 }
292 287
293 public List<InventoryItemBase> GetActiveGestures(UUID userId) 288 public List<InventoryItemBase> GetActiveGestures(UUID userId)
294 { 289 {
295 return new List<InventoryItemBase>(); 290 return new List<InventoryItemBase>();
296 } 291 }
297 292
298 public int GetAssetPermissions(UUID userID, UUID assetID) 293 public int GetAssetPermissions(UUID userID, UUID assetID)
299 { 294 {
300 return m_RemoteConnector.GetAssetPermissions(userID, assetID); 295 return m_RemoteConnector.GetAssetPermissions(userID, assetID);
301 } 296 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index c6fb18d..0e849e5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1002,41 +1002,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1002 1002
1003 public void RegenerateMaptile(byte[] data) 1003 public void RegenerateMaptile(byte[] data)
1004 { 1004 {
1005 // Overwrites the local Asset cache with new maptile data
1006 // Assets are single write, this causes the asset server to ignore this update,
1007 // but the local asset cache does not
1008
1009 // this is on purpose! The net result of this is the region always has the most up to date
1010 // map tile while protecting the (grid) asset database from bloat caused by a new asset each
1011 // time a mapimage is generated!
1012
1013 UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID; 1005 UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
1014 1006
1015 int lastMapRefresh = 0;
1016 int twoDays = 172800;
1017// int RefreshSeconds = twoDays;
1018
1019 try
1020 {
1021 lastMapRefresh = Convert.ToInt32(m_scene.RegionInfo.lastMapRefresh);
1022 }
1023 catch (ArgumentException)
1024 {
1025 }
1026 catch (FormatException)
1027 {
1028 }
1029 catch (OverflowException)
1030 {
1031 }
1032
1033 m_log.Debug("[MAPTILE]: STORING MAPTILE IMAGE"); 1007 m_log.Debug("[MAPTILE]: STORING MAPTILE IMAGE");
1034 1008
1035 m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Random(); 1009 m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Random();
1036 1010
1037 AssetBase asset = new AssetBase( 1011 AssetBase asset = new AssetBase(
1038 m_scene.RegionInfo.RegionSettings.TerrainImageID, 1012 m_scene.RegionInfo.RegionSettings.TerrainImageID,
1039 "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(), 1013 "terrainImage_" + m_scene.RegionInfo.RegionID.ToString(),
1040 (sbyte)AssetType.Texture, 1014 (sbyte)AssetType.Texture,
1041 m_scene.RegionInfo.RegionID.ToString()); 1015 m_scene.RegionInfo.RegionID.ToString());
1042 asset.Data = data; 1016 asset.Data = data;
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index 5a23687..a7aa138 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -171,11 +171,6 @@ namespace OpenSim.Services.Connectors
171 { 171 {
172 return null; 172 return null;
173 } 173 }
174
175 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
176 {
177 return null;
178 }
179 174
180 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 175 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
181 { 176 {
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index e7acb59..e25e7eb 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -431,11 +431,6 @@ namespace OpenSim.Services.Connectors
431 return null; 431 return null;
432 } 432 }
433 433
434 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
435 {
436 return GetFolder(new InventoryFolderBase(folderId, userId));
437 }
438
439 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 434 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
440 { 435 {
441 try 436 try
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 6bf43d5..dc68259 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -314,11 +314,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
314 m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); 314 m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found");
315 return null; 315 return null;
316 } 316 }
317
318 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
319 {
320 return GetFolder(new InventoryFolderBase(folderId, userId));
321 }
322 317
323 /// <summary> 318 /// <summary>
324 /// Get a folder, given by its UUID 319 /// Get a folder, given by its UUID
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index b0ffd8f..1b78fb3 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -170,14 +170,6 @@ namespace OpenSim.Services.Interfaces
170 InventoryItemBase GetItem(InventoryItemBase item); 170 InventoryItemBase GetItem(InventoryItemBase item);
171 171
172 /// <summary> 172 /// <summary>
173 /// Get a folder.
174 /// </summary>
175 /// <param name="folderId"></param>
176 /// <param name="userId"></param>
177 /// <returns></returns>
178 InventoryFolderBase GetFolder(UUID folderId, UUID userId);
179
180 /// <summary>
181 /// Get a folder, given by its UUID 173 /// Get a folder, given by its UUID
182 /// </summary> 174 /// </summary>
183 /// <param name="folder"></param> 175 /// <param name="folder"></param>
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 9f1c4a4..fbcd663 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -439,20 +439,15 @@ namespace OpenSim.Services.InventoryService
439 m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID); 439 m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
440 return null; 440 return null;
441 } 441 }
442
443 public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
444 {
445 InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
446 if (result != null)
447 return result;
448
449 m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
450 return null;
451 }
452 442
453 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) 443 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
454 { 444 {
455 return GetFolder(folder.ID, folder.Owner); 445 InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
446 if (result != null)
447 return result;
448
449 m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
450 return null;
456 } 451 }
457 452
458 public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) 453 public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 00aadc5..af831fd 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -368,11 +368,6 @@ namespace OpenSim.Services.InventoryService
368 368
369 return ConvertToOpenSim(items[0]); 369 return ConvertToOpenSim(items[0]);
370 } 370 }
371
372 public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
373 {
374 return GetFolder(new InventoryFolderBase(folderId, userId));
375 }
376 371
377 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) 372 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
378 { 373 {
diff --git a/OpenSim/Tests/Common/Mock/MockInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
index fc27487..1ea4bc1 100644
--- a/OpenSim/Tests/Common/Mock/MockInventoryService.cs
+++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
@@ -162,11 +162,6 @@ namespace OpenSim.Tests.Common.Mock
162 { 162 {
163 return null; 163 return null;
164 } 164 }
165
166 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
167 {
168 return null;
169 }
170 165
171 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 166 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
172 { 167 {