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

19 files changed, 341 insertions, 61 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3470fa9..9395233 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1913,7 +1913,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             folderBlock.FolderID = folder.ID;
             folderBlock.ParentID = folder.ParentID;
-            folderBlock.Type = -1;
+            //folderBlock.Type = -1;
+            folderBlock.Type = (sbyte)folder.Type;
             folderBlock.Name = Util.StringToBytes256(folder.Name);
 
             return folderBlock;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index ec260b4..0f422ae 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -114,7 +114,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: ViaHGLogin");
                         if (m_RestrictInventoryAccessAbroad)
                         {
-                            RestoreRootFolderContents(client);
+                            IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                            if (uMan.IsLocalGridUser(client.AgentId))
+                            {
+                                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
+                                RestoreRootFolderContents(client);
+                            }
+                            else
+                            {
+                                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is foreign");
+                                RestoreSuitcaseFolderContents(client);
+                            }
                         }
                     }
                 }
@@ -210,7 +220,20 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     logout = success; // flag for later logout from this grid; this is an HG TP
 
                     if (success && m_RestrictInventoryAccessAbroad)
-                        RemoveRootFolderContents(sp.ControllingClient);
+                    {
+                        IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>();
+                        if (uMan != null && uMan.IsLocalGridUser(sp.UUID))
+                        {
+                            // local grid user
+                            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
+                            RemoveRootFolderContents(sp.ControllingClient);
+                        }
+                        else
+                        {
+                            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is foreign");
+                            RemoveSuitcaseFolderContents(sp.ControllingClient);
+                        }
+                    }
 
                     return success;
                 }
@@ -401,25 +424,40 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
                     if (root != null)
                     {
-                        m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Removing root inventory for user {0}", client.AgentId);
+                        m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Removing root inventory for user {0}", client.Name);
                         InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
-                        UUID[] ids = new UUID[content.Folders.Count];
-                        int i = 0;
+                        List<UUID> fids = new List<UUID>();
+                        List<UUID> iids = new List<UUID>();
+                        List<InventoryFolderBase> keep = new List<InventoryFolderBase>();
+
                         foreach (InventoryFolderBase f in content.Folders)
-                            ids[i++] = f.ID;
-                        inv.SendRemoveInventoryFolders(ids);
-                        ids = new UUID[content.Items.Count];
-                        i = 0;
+                        {
+                            if (f.Name != "My Suitcase")
+                            {
+                                f.Name = f.Name + " (Unavailable)";
+                                keep.Add(f);
+                            }
+                        }
+
+                        // items directly under the root folder
                         foreach (InventoryItemBase it in content.Items)
-                            ids[i++] = it.ID;
-                        inv.SendRemoveInventoryItems(ids);
+                            it.Name = it.Name + " (Unavailable)"; ;
+
+                        // Send the new names 
+                        inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray());
+
                     }
                 }
             }
         }
 
+        private void RemoveSuitcaseFolderContents(IClientAPI client)
+        {
+        }
+
         private void RestoreRootFolderContents(IClientAPI client)
         {
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root folder");
             if (client is IClientCore)
             {
                 IClientCore core = (IClientCore)client;
@@ -428,21 +466,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (core.TryGet<IClientInventory>(out inv))
                 {
                     InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
-                    client.SendBulkUpdateInventory(root);
-                    //if (root != null)
-                    //{
-                    //    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory for user {0}", client.AgentId);
-                    //    InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
-                    //    m_log.DebugFormat("[XXX]: Folder name {0}, id {1}, parent {2}", root.Name, root.ID, root.ParentID);
-                    //    foreach (InventoryItemBase i in content.Items)
-                    //        m_log.DebugFormat("[XXX]:   Name={0}, folderID={1}", i.Name, i.Folder);
-
-                    //    inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray());
-                    //}
+                    InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
+
+                    inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray());
                 }
             }
         }
 
+        private void RestoreSuitcaseFolderContents(IClientAPI client)
+        {
+        }
+
         private GridRegion MakeRegion(AgentCircuitData aCircuit)
         {
             GridRegion region = new GridRegion();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 4be3804..cf6d2f7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -297,14 +297,35 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_LocalGridInventoryService.CreateUserInventory(userID);
         }
 
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userID)
         {
-            return m_LocalGridInventoryService.GetInventorySkeleton(userId);
+            string invURL = GetInventoryServiceURL(userID);
+
+            if (invURL == null) // not there, forward to local inventory connector to resolve
+                return m_LocalGridInventoryService.GetInventorySkeleton(userID);
+
+            IInventoryService connector = GetConnector(invURL);
+
+            return connector.GetInventorySkeleton(userID);
         }
 
         public InventoryCollection GetUserInventory(UUID userID)
         {
-            return null;
+            string invURL = GetInventoryServiceURL(userID);
+            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetUserInventory for {0} {1}", userID, invURL);
+
+            if (invURL == null) // not there, forward to local inventory connector to resolve
+                return m_LocalGridInventoryService.GetUserInventory(userID);
+
+            InventoryCollection c = m_Cache.GetUserInventory(userID);
+            if (c != null)
+                return c;
+
+            IInventoryService connector = GetConnector(invURL);
+            c = connector.GetUserInventory(userID);
+
+            m_Cache.Cache(userID, c);
+            return c;
         }
 
         public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
@@ -362,8 +383,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (invURL == null) // not there, forward to local inventory connector to resolve
                 return m_LocalGridInventoryService.GetFolderContent(userID, folderID);
 
-            IInventoryService connector = GetConnector(invURL);
+            InventoryCollection c = m_Cache.GetFolderContent(userID, folderID);
+            if (c != null)
+            {
+                m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent found content in cache " + folderID);
+                return c;
+            }
 
+            IInventoryService connector = GetConnector(invURL);
             return connector.GetFolderContent(userID, folderID);
 
         }
@@ -377,8 +404,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (invURL == null) // not there, forward to local inventory connector to resolve
                 return m_LocalGridInventoryService.GetFolderItems(userID, folderID);
 
-            IInventoryService connector = GetConnector(invURL);
+            List<InventoryItemBase> items = m_Cache.GetFolderItems(userID, folderID);
+            if (items != null)
+            {
+                m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems found items in cache " + folderID);
+                return items;
+            }
 
+            IInventoryService connector = GetConnector(invURL);
             return connector.GetFolderItems(userID, folderID);
 
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 0fe778d..1e434b9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -12,6 +12,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private static ExpiringCache<UUID, InventoryFolderBase> m_RootFolders = new ExpiringCache<UUID, InventoryFolderBase>();
         private static ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>> m_FolderTypes = new ExpiringCache<UUID, Dictionary<AssetType, InventoryFolderBase>>();
+        private static ExpiringCache<UUID, InventoryCollection> m_Inventories = new ExpiringCache<UUID, InventoryCollection>();
 
         public void Cache(UUID userID, InventoryFolderBase root)
         {
@@ -55,5 +56,55 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
             return null;
         }
+
+        public void Cache(UUID userID, InventoryCollection inv)
+        {
+            lock (m_Inventories)
+                m_Inventories.AddOrUpdate(userID, inv, 120);
+        }
+
+        public InventoryCollection GetUserInventory(UUID userID)
+        {
+            InventoryCollection inv = null;
+            if (m_Inventories.TryGetValue(userID, out inv))
+                return inv;
+            return null;
+        }
+
+        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        {
+            InventoryCollection inv = null;
+            InventoryCollection c;
+            if (m_Inventories.TryGetValue(userID, out inv))
+            {
+                c = new InventoryCollection();
+                c.UserID = userID;
+
+                c.Folders = inv.Folders.FindAll(delegate(InventoryFolderBase f)
+                {
+                    return f.ParentID == folderID;
+                });
+                c.Items = inv.Items.FindAll(delegate(InventoryItemBase i)
+                {
+                    return i.Folder == folderID;
+                });
+                return c;
+            }
+            return null;
+        }
+
+        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        {
+            InventoryCollection inv = null;
+            if (m_Inventories.TryGetValue(userID, out inv))
+            {
+                List<InventoryItemBase> items = inv.Items.FindAll(delegate(InventoryItemBase i)
+                {
+                    return i.Folder == folderID;
+                });
+                return items;
+            }
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 77573c3..990dffb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public  InventoryCollection GetUserInventory(UUID userID)
         {
-            return null;
+            return m_RemoteConnector.GetUserInventory(userID);
         }
 
         public  void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
@@ -193,16 +193,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
 
-            if (UserManager != null)
+            if (invCol != null && UserManager != null)
             {
                 // Protect ourselves against the caller subsequently modifying the items list
                 List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
 
-                Util.FireAndForget(delegate
-                {
-                    foreach (InventoryItemBase item in items)
-                        UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                });
+                if (items != null && items.Count > 0)
+                    Util.FireAndForget(delegate
+                    {
+                        foreach (InventoryItemBase item in items)
+                            UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+                    });
             }
 
             return invCol;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index a0ed5a5..ced7b52 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -56,6 +56,9 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
         protected Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
 
+        protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
+        protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
+
         public bool[,] LandBitmap
         {
             get { return m_landBitmap; }
@@ -417,6 +420,45 @@ namespace OpenSim.Region.CoreModules.World.Land
             return false;
         }
 
+        public bool HasGroupAccess(UUID avatar)
+        {
+            if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
+            {
+                ScenePresence sp;
+                if (!m_scene.TryGetScenePresence(avatar, out sp))
+                {
+                    bool isMember;
+                    if (m_groupMemberCache.TryGetValue(avatar, out isMember))
+                        return isMember;
+
+                    IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
+                    if (groupsModule == null)
+                        return false;
+
+                    GroupMembershipData[] membership = groupsModule.GetMembershipData(avatar);
+                    if (membership == null || membership.Length == 0)
+                    {
+                        m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
+                        return false;
+                    }
+
+                    foreach (GroupMembershipData d in membership)
+                    {
+                        if (d.GroupID == LandData.GroupID)
+                        {
+                            m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout);
+                            return true;
+                        }
+                    }
+                    m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
+                    return false;
+                }
+
+                return sp.ControllingClient.IsGroupMember(LandData.GroupID);
+            }
+            return false;
+        }
+
         public bool IsBannedFromLand(UUID avatar)
         {
             ExpireAccessList();
@@ -448,6 +490,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsRestrictedFromLand(UUID avatar)
         {
+            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) == 0)
+                return false;
+
             if (m_scene.Permissions.IsAdministrator(avatar))
                 return false;
 
@@ -457,10 +502,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (avatar == LandData.OwnerID)
                 return false;
 
-            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) == 0)
+            if (HasGroupAccess(avatar))
                 return false;
 
-            return (!IsInLandAccessList(avatar));
+            return !IsInLandAccessList(avatar);
         }
 
         public bool IsInLandAccessList(UUID avatar)
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index 90f124b..fb57c82 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -72,5 +72,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         {
             return "BMP";
         }
+
+        //Returns true if this extension is supported for terrain save-tile
+        public override bool SupportsTileSave()
+        {
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index f331b56..79cc50b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -57,5 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         {
             return "GIF";
         }
+
+        //Returns true if this extension is supported for terrain save-tile
+        public override bool SupportsTileSave()
+        {
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 58925fd..da81dc1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -177,6 +177,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             return "SYS.DRAWING";
         }
 
+        //Returns true if this extension is supported for terrain save-tile
+        public virtual bool SupportsTileSave()
+        {
+            return false;
+        }
+
         /// <summary>
         /// Protected method, generates a grayscale bitmap
         /// image from a specified terrain channel.
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index 1a0d8ec..699d67a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -91,6 +91,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             return "JPEG";
         }
 
+        //Returns true if this extension is supported for terrain save-tile
+        public bool SupportsTileSave()
+        {
+            return false;
+        }
+
         private static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
             Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index fad7641..62d232e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -254,5 +254,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         {
             return "LL/SL RAW";
         }
+
+        //Returns true if this extension is supported for terrain save-tile
+        public bool SupportsTileSave()
+        {
+            return false;
+        }
+
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index e009ecf..c5c12ae 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -57,5 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         {
             return "PNG";
         }
+
+        //Returns true if this extension is supported for terrain save-tile
+        public override bool SupportsTileSave()
+        {
+            return true;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
index ba073ca..9fb7ef7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
@@ -173,5 +173,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         {
             return "RAW32";
         }
+
+        //Returns true if this extension is supported for terrain save-tile
+        public bool SupportsTileSave()
+        {
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index fc1ad33..5d2f893 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -57,5 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         {
             return "TIFF";
         }
+
+        //Returns true if this extension is supported for terrain save-tile
+        public bool SupportsTileSave()
+        {
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 2f37d9d..1ebf916 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -323,6 +323,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             return "Terragen";
         }
 
+        //Returns true if this extension is supported for terrain save-tile
+        public bool SupportsTileSave()
+        {
+            return false;
+        }
+
         /// <summary>
         /// terragen SCAL floats need to be written intel ordered regardless of
         /// big or little endian system
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index d407617..3ba3657 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -32,6 +32,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainLoader
     {
+        // Returns true if that extension can be used for terrain save-tile
+        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders) 
+        bool SupportsTileSave();
+
         string FileExtension { get; }
         ITerrainChannel LoadFile(string filename);
         ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index b3c2969..8535a5a 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -93,6 +93,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// </summary>
         private string m_supportedFileExtensions = "";
 
+        //For terrain save-tile file extensions
+        private string m_supportFileExtensionsForTileSave = "";
+
         #region ICommandableModule Members
 
         public ICommander CommandInterface
@@ -148,11 +151,20 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             // Generate user-readable extensions list
             string supportedFilesSeparator = "";
+            string supportedFilesSeparatorForTileSave = "";
 
+            m_supportFileExtensionsForTileSave = "";
             foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
             {
                 m_supportedFileExtensions += supportedFilesSeparator + loader.Key + " (" + loader.Value + ")";
                 supportedFilesSeparator = ", ";
+
+                //For terrain save-tile file extensions
+                if (loader.Value.SupportsTileSave() == true)
+                {
+                    m_supportFileExtensionsForTileSave += supportedFilesSeparatorForTileSave + loader.Key + " (" + loader.Value + ")";
+                    supportedFilesSeparatorForTileSave = ", ";
+                }
             }
         }
 
@@ -589,7 +601,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             // this region is included in the tile request
             foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
             {
-                if (filename.EndsWith(loader.Key))
+                if (filename.EndsWith(loader.Key) && loader.Value.SupportsTileSave())
                 {
                     lock (m_scene)
                     {
@@ -610,7 +622,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             MainConsole.Instance.OutputFormat(
                 "ERROR: Could not save terrain from {0} to {1}.  Valid file extensions are {2}",
-                m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions);
+                m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
         }
 
         /// <summary>
@@ -1192,7 +1204,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 new Command("save-tile", CommandIntentions.COMMAND_HAZARDOUS, InterfaceSaveTileFile, "Saves the current heightmap to the larger file.");
             saveToTileCommand.AddArgument("filename",
                                             "The file you wish to save to, the file extension determines the loader to be used. Supported extensions include: " +
-                                            m_supportedFileExtensions, "String");
+                                            m_supportFileExtensionsForTileSave, "String");
             saveToTileCommand.AddArgument("file width", "The width of the file in tiles", "Integer");
             saveToTileCommand.AddArgument("file height", "The height of the file in tiles", "Integer");
             saveToTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file",
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5abd74f..10b25ed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -36,6 +36,7 @@ using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Framework;
+using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Serialization;
 
@@ -117,31 +118,42 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="item"></param>
         public bool AddInventoryItem(InventoryItemBase item)
         {
-            if (UUID.Zero == item.Folder)
+            if (item.Folder != UUID.Zero && InventoryService.AddItem(item))
             {
-                InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
-                if (f != null)
+                int userlevel = 0;
+                if (Permissions.IsGod(item.Owner))
                 {
-//                    m_log.DebugFormat(
-//                        "[LOCAL INVENTORY SERVICES CONNECTOR]: Found folder {0} type {1} for item {2}", 
-//                        f.Name, (AssetType)f.Type, item.Name);
+                    userlevel = 1;
+                }
+                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel);
+
+                return true;
+            }
+
+            // OK so either the viewer didn't send a folderID or AddItem failed
+            UUID originalFolder = item.Folder;
+            InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
+            if (f != null)
+            {
+                m_log.DebugFormat(
+                    "[AGENT INVENTORY]: Found folder {0} type {1} for item {2}",
+                    f.Name, (AssetType)f.Type, item.Name);
                     
+                item.Folder = f.ID;
+            }
+            else
+            {
+                f = InventoryService.GetRootFolder(item.Owner);
+                if (f != null)
+                {
                     item.Folder = f.ID;
                 }
                 else
                 {
-                    f = InventoryService.GetRootFolder(item.Owner);
-                    if (f != null)
-                    {
-                        item.Folder = f.ID;
-                    }
-                    else
-                    {
-                        m_log.WarnFormat(
-                            "[AGENT INVENTORY]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
-                            item.Owner, item.Name);
-                        return false;
-                    }
+                    m_log.WarnFormat(
+                        "[AGENT INVENTORY]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
+                        item.Owner, item.Name);
+                    return false;
                 }
             }
             
@@ -153,7 +165,13 @@ namespace OpenSim.Region.Framework.Scenes
                     userlevel = 1;
                 }
                 EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel);
-                
+
+                if (originalFolder != UUID.Zero)
+                {
+                    // Tell the viewer that the item didn't go there
+                    ChangePlacement(item, f);
+                }
+
                 return true;
             }
             else
@@ -165,7 +183,32 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
             }
         }
-        
+
+        private void ChangePlacement(InventoryItemBase item, InventoryFolderBase f)
+        {
+            ScenePresence sp = GetScenePresence(item.Owner);
+            if (sp != null)
+            {
+                if (sp.ControllingClient is IClientCore)
+                {
+                    IClientCore core = (IClientCore)sp.ControllingClient;
+                    IClientInventory inv;
+
+                    if (core.TryGet<IClientInventory>(out inv))
+                    {
+                        InventoryFolderBase parent = new InventoryFolderBase(f.ParentID, f.Owner);
+                        parent = InventoryService.GetFolder(parent);
+                        inv.SendRemoveInventoryItems(new UUID[] { item.ID });
+                        inv.SendBulkUpdateInventory(new InventoryFolderBase[0], new InventoryItemBase[] { item });
+                        string message = "The item was placed in folder " + f.Name;
+                        if (parent != null)
+                            message += " under " + parent.Name;
+                        sp.ControllingClient.SendAgentAlertMessage(message, false);
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// Add the given inventory item to a user's inventory.
         /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 2a15e5d..e669f4c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1294,7 +1294,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             OnAgentDataUpdateRequest(remoteClient, dataForAgentID, UUID.Zero);
 
-
             // Need to send a group membership update to the client
             // UDP version doesn't seem to behave nicely.  But we're going to send it out here
             // with an empty group membership to hopefully remove groups being displayed due
@@ -1305,6 +1304,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray);
             remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray);
 
+            if (remoteClient.AgentId == dataForAgentID)
+                remoteClient.RefreshGroupMembership();
         }
 
         /// <summary>