Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs

@@ -575,9 +575,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                     itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                     new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>());
 
-            InventoryFolderBase folder1Post = scene.InventoryService.GetFolder(folder1.ID, ua1.PrincipalID);
+            InventoryFolderBase folder1Post 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
             Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
-            
             /*
             InventoryFolderBase folder2 
                 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");

OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -229,8 +229,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library
         /// <returns></returns>
         public InventoryItemBase GetItem(InventoryItemBase item) { return null; }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) { return null; }
-        
         /// <summary>
         /// Get a folder, given by its UUID
         /// </summary>

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs

@@ -205,8 +205,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public abstract InventoryItemBase GetItem(InventoryItemBase item);
 
-        public abstract InventoryFolderBase GetFolder(UUID folderId, UUID userId);
-        
         public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
 
         /// <summary>

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -486,11 +486,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return connector.GetItem(item);
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }        
-        
         public  InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             if (folder == null)

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs

@@ -267,11 +267,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return item;
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }
-        
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.GetFolder(folder);

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs

@@ -307,11 +307,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
         }
 
-        public override InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId)); 
-        }
-        
         public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             if (folder == null)

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs

@@ -271,11 +271,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_RemoteConnector.GetItem(item);
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));            
-        }
-        
         public  InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -1002,41 +1002,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public void RegenerateMaptile(byte[] data)
         {
-            // Overwrites the local Asset cache with new maptile data
-            // Assets are single write, this causes the asset server to ignore this update,
-            // but the local asset cache does not
-
-            // this is on purpose!  The net result of this is the region always has the most up to date
-            // map tile while protecting the (grid) asset database from bloat caused by a new asset each
-            // time a mapimage is generated!
-
             UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
 
-            int lastMapRefresh = 0;
-            int twoDays = 172800;
-//            int RefreshSeconds = twoDays;
-
-            try
-            {
-                lastMapRefresh = Convert.ToInt32(m_scene.RegionInfo.lastMapRefresh);
-            }
-            catch (ArgumentException)
-            {
-            }
-            catch (FormatException)
-            {
-            }
-            catch (OverflowException)
-            {
-            }
-
             m_log.Debug("[MAPTILE]: STORING MAPTILE IMAGE");
 
             m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Random();
 
             AssetBase asset = new AssetBase(
                 m_scene.RegionInfo.RegionSettings.TerrainImageID,
-                "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(),
+                "terrainImage_" + m_scene.RegionInfo.RegionID.ToString(),
                 (sbyte)AssetType.Texture,
                 m_scene.RegionInfo.RegionID.ToString());
             asset.Data = data;

OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs

@@ -172,11 +172,6 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return null; 
-        }
-
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return null;

OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs

@@ -431,11 +431,6 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }
-        
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             try

OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -315,11 +315,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return null;
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }
-
         /// <summary>
         /// Get a folder, given by its UUID
         /// </summary>

OpenSim/Services/Interfaces/IInventoryService.cs

@@ -169,14 +169,6 @@ namespace OpenSim.Services.Interfaces
         /// <returns></returns>
         InventoryItemBase GetItem(InventoryItemBase item);
 
-        /// <summary>
-        /// Get a folder.
-        /// </summary>
-        /// <param name="folderId"></param>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        InventoryFolderBase GetFolder(UUID folderId, UUID userId);
-        
         /// <summary>
         /// Get a folder, given by its UUID
         /// </summary>

OpenSim/Services/InventoryService/InventoryService.cs

@@ -440,21 +440,16 @@ namespace OpenSim.Services.InventoryService
             return null;
         }
 
-        public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
+        public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
-            InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
+            InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
             if (result != null)
                 return result;
 
-            m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
+            m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
             return null;
         }
 
-        public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
-        {
-            return GetFolder(folder.ID, folder.Owner);
-        }
-
         public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
         {
             m_log.InfoFormat("[INVENTORY SERVICE]: Deleting {0} folders from user {1}", folderIDs.Count, ownerID);

OpenSim/Services/InventoryService/XInventoryService.cs

@@ -369,11 +369,6 @@ namespace OpenSim.Services.InventoryService
             return ConvertToOpenSim(items[0]);
         }
 
-        public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }
-
         public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             XInventoryFolder[] folders = m_Database.GetFolders(

OpenSim/Tests/Common/Mock/MockInventoryService.cs

@@ -163,11 +163,6 @@ namespace OpenSim.Tests.Common.Mock
             return null;
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return null; 
-        }
-
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return null;