From: Latif Khalifa <latifer@streamgrid.net>
Date: Fri, 7 Aug 2015 16:54:15 +0000 (+0200)
Subject: Adjust to the introduction of FolderType ENUM in libomv
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f22355b85e1102d8c0a41cd6d70a0214f29364e8;hp=dc536c5d33fd89a815a75f21887d70ea9465744f;p=radegast%2Fradegast.git

Adjust to the introduction of FolderType ENUM in libomv
---

diff --git a/Radegast/Core/Contexts/DeRezObjectAction.cs b/Radegast/Core/Contexts/DeRezObjectAction.cs
index 9d735a6..4dd0b24 100644
--- a/Radegast/Core/Contexts/DeRezObjectAction.cs
+++ b/Radegast/Core/Contexts/DeRezObjectAction.cs
@@ -65,7 +65,7 @@ namespace Radegast
             DebugLog("Found prim: " + thePrim);
             Client.Inventory.RequestDeRezToInventory(
                 thePrim.LocalID, DeRezDestination.AgentInventoryTake,
-                Client.Inventory.FindFolderForType(AssetType.TrashFolder),
+                Client.Inventory.FindFolderForType(FolderType.Trash),
                 UUID.Random());
         }
     }
diff --git a/Radegast/Core/InitialOutfit.cs b/Radegast/Core/InitialOutfit.cs
index f508527..7b51044 100644
--- a/Radegast/Core/InitialOutfit.cs
+++ b/Radegast/Core/InitialOutfit.cs
@@ -67,7 +67,7 @@ namespace Radegast
             return null;
         }
 
-        public UUID CreateFolder(UUID parent, string name, AssetType type)
+        public UUID CreateFolder(UUID parent, string name, FolderType type)
         {
             UUID ret = UUID.Zero;
             AutoResetEvent folderCreated = new AutoResetEvent(false);
@@ -122,17 +122,17 @@ namespace Radegast
         public void CheckFolders()
         {
             // Check if we have clothing folder
-            var clothingID = Client.Inventory.FindFolderForType(AssetType.Clothing);
+            var clothingID = Client.Inventory.FindFolderForType(FolderType.Clothing);
             if (clothingID == Store.RootFolder.UUID)
             {
-                clothingID = CreateFolder(Store.RootFolder.UUID, "Clothing", AssetType.Clothing);
+                clothingID = CreateFolder(Store.RootFolder.UUID, "Clothing", FolderType.Clothing);
             }
 
             // Check if we have trash folder
-            var trashID = Client.Inventory.FindFolderForType(AssetType.TrashFolder);
+            var trashID = Client.Inventory.FindFolderForType(FolderType.Trash);
             if (trashID == Store.RootFolder.UUID)
             {
-                trashID = CreateFolder(Store.RootFolder.UUID, "Trash", AssetType.TrashFolder);
+                trashID = CreateFolder(Store.RootFolder.UUID, "Trash", FolderType.Trash);
             }
         }
 
diff --git a/Radegast/GUI/Consoles/Assets/Notecard.cs b/Radegast/GUI/Consoles/Assets/Notecard.cs
index e519520..5ec07c9 100644
--- a/Radegast/GUI/Consoles/Assets/Notecard.cs
+++ b/Radegast/GUI/Consoles/Assets/Notecard.cs
@@ -375,7 +375,7 @@ namespace Radegast
 
         private void btnDiscard_Click(object sender, EventArgs e)
         {
-            client.Inventory.MoveItem(notecard.UUID, client.Inventory.FindFolderForType(AssetType.TrashFolder), notecard.Name);
+            client.Inventory.MoveItem(notecard.UUID, client.Inventory.FindFolderForType(FolderType.Trash), notecard.Name);
             Retach();
         }
     }
diff --git a/Radegast/GUI/Consoles/Inventory/CurrentOutfitFolder.cs b/Radegast/GUI/Consoles/Inventory/CurrentOutfitFolder.cs
index 95eb20a..78602f8 100644
--- a/Radegast/GUI/Consoles/Inventory/CurrentOutfitFolder.cs
+++ b/Radegast/GUI/Consoles/Inventory/CurrentOutfitFolder.cs
@@ -223,7 +223,7 @@ namespace Radegast
             List<InventoryBase> rootContent = Client.Inventory.Store.GetContents(Client.Inventory.Store.RootFolder.UUID);
             foreach (InventoryBase baseItem in rootContent)
             {
-                if (baseItem is InventoryFolder && ((InventoryFolder)baseItem).PreferredType == AssetType.CurrentOutfitFolder)
+                if (baseItem is InventoryFolder && ((InventoryFolder)baseItem).PreferredType == FolderType.CurrentOutfit)
                 {
                     COF = (InventoryFolder)baseItem;
                     break;
@@ -242,7 +242,7 @@ namespace Radegast
 
         void CreateCOF()
         {
-            UUID cofID = Client.Inventory.CreateFolder(Client.Inventory.Store.RootFolder.UUID, "Current Look", AssetType.CurrentOutfitFolder);
+            UUID cofID = Client.Inventory.CreateFolder(Client.Inventory.Store.RootFolder.UUID, "Current Look", FolderType.CurrentOutfit);
             if (Client.Inventory.Store.Items.ContainsKey(cofID) && Client.Inventory.Store.Items[cofID].Data is InventoryFolder)
             {
                 COF = (InventoryFolder)Client.Inventory.Store.Items[cofID].Data;
diff --git a/Radegast/GUI/Consoles/Inventory/FolderCopy.cs b/Radegast/GUI/Consoles/Inventory/FolderCopy.cs
index af216db..f08a24c 100644
--- a/Radegast/GUI/Consoles/Inventory/FolderCopy.cs
+++ b/Radegast/GUI/Consoles/Inventory/FolderCopy.cs
@@ -47,7 +47,7 @@ namespace Radegast
 
         public void CopyFolder(InventoryFolder dest, InventoryFolder folder)
         {
-            UUID newFolderID = Client.Inventory.CreateFolder(dest.UUID, folder.Name, AssetType.Unknown);
+            UUID newFolderID = Client.Inventory.CreateFolder(dest.UUID, folder.Name, FolderType.None);
             Thread.Sleep(500);
             var items = Client.Inventory.FolderContents(folder.UUID, folder.OwnerID, true, true, InventorySortOrder.ByDate, 45 * 1000);
             AutoResetEvent copied = new AutoResetEvent(false);
diff --git a/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs b/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs
index fa2f1c8..e40c0a4 100644
--- a/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs
+++ b/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs
@@ -144,7 +144,7 @@ namespace Radegast
                 InventoryFolder f = new InventoryFolder(UUID.Random());
                 f.Name = "";
                 f.ParentUUID = UUID.Zero;
-                f.PreferredType = AssetType.Unknown;
+                f.PreferredType = FolderType.None;
                 TreeNode dirNode = new TreeNode();
                 dirNode.Name = f.UUID.ToString();
                 dirNode.Text = f.Name;
@@ -300,7 +300,7 @@ namespace Radegast
 
         void Inventory_InventoryObjectAdded(object sender, InventoryObjectAddedEventArgs e)
         {
-            if (e.Obj is InventoryFolder && ((InventoryFolder)e.Obj).PreferredType == AssetType.TrashFolder)
+            if (e.Obj is InventoryFolder && ((InventoryFolder)e.Obj).PreferredType == FolderType.Trash)
             {
                 trashCreated.Set();
             }
@@ -1337,8 +1337,8 @@ namespace Radegast
 
                     ToolStripMenuItem ctxItem;
 
-                    if ((int)folder.PreferredType >= (int)AssetType.EnsembleStart &&
-                        (int)folder.PreferredType <= (int)AssetType.EnsembleEnd)
+                    if (folder.PreferredType >= FolderType.EnsembleStart &&
+                        folder.PreferredType <= FolderType.EnsembleEnd)
                     {
                         ctxItem = new ToolStripMenuItem("Fix type", null, OnInvContextClick);
                         ctxItem.Name = "fix_type";
@@ -1380,22 +1380,22 @@ namespace Radegast
                     ctxItem.Name = "collapse";
                     ctxInv.Items.Add(ctxItem);
 
-                    if (folder.PreferredType == AssetType.TrashFolder)
+                    if (folder.PreferredType == FolderType.Trash)
                     {
                         ctxItem = new ToolStripMenuItem("Empty Trash", null, OnInvContextClick);
                         ctxItem.Name = "empty_trash";
                         ctxInv.Items.Add(ctxItem);
                     }
 
-                    if (folder.PreferredType == AssetType.LostAndFoundFolder)
+                    if (folder.PreferredType == FolderType.LostAndFound)
                     {
                         ctxItem = new ToolStripMenuItem("Empty Lost and Found", null, OnInvContextClick);
                         ctxItem.Name = "empty_lost_found";
                         ctxInv.Items.Add(ctxItem);
                     }
 
-                    if (folder.PreferredType == AssetType.Unknown ||
-                        folder.PreferredType == AssetType.OutfitFolder)
+                    if (folder.PreferredType == FolderType.None ||
+                        folder.PreferredType == FolderType.Outfit)
                     {
                         ctxItem = new ToolStripMenuItem("Rename", null, OnInvContextClick);
                         ctxItem.Name = "rename_folder";
@@ -1426,8 +1426,8 @@ namespace Radegast
                         }
                     }
 
-                    if (folder.PreferredType == AssetType.Unknown ||
-                        folder.PreferredType == AssetType.OutfitFolder)
+                    if (folder.PreferredType == FolderType.None ||
+                        folder.PreferredType == FolderType.Outfit)
                     {
                         ctxItem = new ToolStripMenuItem("Delete", null, OnInvContextClick);
                         ctxItem.Name = "delete_folder";
@@ -1436,7 +1436,7 @@ namespace Radegast
                         ctxInv.Items.Add(new ToolStripSeparator());
                     }
 
-                    if (folder.PreferredType == AssetType.Unknown || folder.PreferredType == AssetType.OutfitFolder)
+                    if (folder.PreferredType == FolderType.None || folder.PreferredType == FolderType.Outfit)
                     {
                         ctxItem = new ToolStripMenuItem("Take off Items", null, OnInvContextClick);
                         ctxItem.Name = "outfit_take_off";
@@ -1699,7 +1699,7 @@ namespace Radegast
                         break;
 
                     case "fix_type":
-                        client.Inventory.UpdateFolderProperties(f.UUID, f.ParentUUID, f.Name, AssetType.Unknown);
+                        client.Inventory.UpdateFolderProperties(f.UUID, f.ParentUUID, f.Name, FolderType.None);
                         invTree.Sort();
                         break;
 
@@ -1731,13 +1731,13 @@ namespace Radegast
 
 
                     case "delete_folder":
-                        var trash = client.Inventory.FindFolderForType(AssetType.TrashFolder);
+                        var trash = client.Inventory.FindFolderForType(FolderType.Trash);
                         if (trash == Inventory.RootFolder.UUID)
                         {
                             WorkPool.QueueUserWorkItem(sync =>
                             {
                                 trashCreated.Reset();
-                                trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", AssetType.TrashFolder);
+                                trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", FolderType.Trash);
                                 trashCreated.WaitOne(20 * 1000, false);
                                 Thread.Sleep(200);
                                 client.Inventory.MoveFolder(f.UUID, trash, f.Name);
@@ -1841,13 +1841,13 @@ namespace Radegast
                         break;
 
                     case "delete_item":
-                        var trash = client.Inventory.FindFolderForType(AssetType.TrashFolder);
+                        var trash = client.Inventory.FindFolderForType(FolderType.Trash);
                         if (trash == Inventory.RootFolder.UUID)
                         {
                             WorkPool.QueueUserWorkItem(sync =>
                             {
                                 trashCreated.Reset();
-                                trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", AssetType.TrashFolder);
+                                trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", FolderType.Trash);
                                 trashCreated.WaitOne(20 * 1000, false);
                                 Thread.Sleep(200);
                                 client.Inventory.MoveItem(item.UUID, trash, item.Name);
@@ -1855,7 +1855,7 @@ namespace Radegast
                             return;
                         }
 
-                        client.Inventory.MoveItem(item.UUID, client.Inventory.FindFolderForType(AssetType.TrashFolder), item.Name);
+                        client.Inventory.MoveItem(item.UUID, client.Inventory.FindFolderForType(FolderType.Trash), item.Name);
                         break;
 
                     case "rename_item":
@@ -2038,7 +2038,7 @@ namespace Radegast
                 {
                     WorkPool.QueueUserWorkItem((object state) =>
                         {
-                            UUID newFolderID = client.Inventory.CreateFolder(dest.UUID, instance.InventoryClipboard.Item.Name, AssetType.Unknown);
+                            UUID newFolderID = client.Inventory.CreateFolder(dest.UUID, instance.InventoryClipboard.Item.Name, FolderType.None);
                             Thread.Sleep(500);
 
                             // FIXME: for some reason copying a bunch of items in one operation does not work
@@ -2151,8 +2151,8 @@ namespace Radegast
             if (e.Node == null ||
                 !(e.Node.Tag is InventoryBase) ||
                 (e.Node.Tag is InventoryFolder &&
-                ((InventoryFolder)e.Node.Tag).PreferredType != AssetType.Unknown &&
-                ((InventoryFolder)e.Node.Tag).PreferredType != AssetType.OutfitFolder)
+                ((InventoryFolder)e.Node.Tag).PreferredType != FolderType.None &&
+                ((InventoryFolder)e.Node.Tag).PreferredType != FolderType.Outfit)
                 )
             {
                 e.CancelEdit = true;
@@ -2216,10 +2216,10 @@ namespace Radegast
             }
             else if (e.KeyCode == Keys.Delete && invTree.SelectedNode != null)
             {
-                var trash = client.Inventory.FindFolderForType(AssetType.TrashFolder);
+                var trash = client.Inventory.FindFolderForType(FolderType.Trash);
                 if (trash == Inventory.RootFolder.UUID)
                 {
-                    trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", AssetType.TrashFolder);
+                    trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", FolderType.Trash);
                     Thread.Sleep(2000);
                 }
 
@@ -2244,7 +2244,7 @@ namespace Radegast
         private void invTree_ItemDrag(object sender, ItemDragEventArgs e)
         {
             invTree.SelectedNode = e.Item as TreeNode;
-            if (invTree.SelectedNode.Tag is InventoryFolder && ((InventoryFolder)invTree.SelectedNode.Tag).PreferredType != AssetType.Unknown)
+            if (invTree.SelectedNode.Tag is InventoryFolder && ((InventoryFolder)invTree.SelectedNode.Tag).PreferredType != FolderType.None)
             {
                 return;
             }
@@ -2741,11 +2741,11 @@ namespace Radegast
         {
             if (_sysfirst)
             {
-                if (x.PreferredType != AssetType.Unknown && y.PreferredType == AssetType.Unknown)
+                if (x.PreferredType != FolderType.None && y.PreferredType == FolderType.None)
                 {
                     return -1;
                 }
-                else if (x.PreferredType == AssetType.Unknown && y.PreferredType != AssetType.Unknown)
+                else if (x.PreferredType == FolderType.None && y.PreferredType != FolderType.None)
                 {
                     return 1;
                 }
diff --git a/Radegast/GUI/Consoles/ObjectsConsole.cs b/Radegast/GUI/Consoles/ObjectsConsole.cs
index 7465c77..88a2a85 100644
--- a/Radegast/GUI/Consoles/ObjectsConsole.cs
+++ b/Radegast/GUI/Consoles/ObjectsConsole.cs
@@ -1213,7 +1213,7 @@ namespace Radegast
             else
             {
                 instance.MediaManager.PlayUISound(UISounds.ObjectDelete);
-                client.Inventory.RequestDeRezToInventory(currentPrim.LocalID, DeRezDestination.AgentInventoryTake, client.Inventory.FindFolderForType(AssetType.TrashFolder), UUID.Random());
+                client.Inventory.RequestDeRezToInventory(currentPrim.LocalID, DeRezDestination.AgentInventoryTake, client.Inventory.FindFolderForType(FolderType.Trash), UUID.Random());
             }
         }
 
diff --git a/Radegast/GUI/Notifications/InventoryOfferNotification.cs b/Radegast/GUI/Notifications/InventoryOfferNotification.cs
index 2debb4c..4dcccea 100644
--- a/Radegast/GUI/Notifications/InventoryOfferNotification.cs
+++ b/Radegast/GUI/Notifications/InventoryOfferNotification.cs
@@ -150,7 +150,7 @@ namespace Radegast
                 {
                     client.Inventory.Move(
                         client.Inventory.Store.Items[objectID].Data,
-                        (InventoryFolder)client.Inventory.Store.Items[client.Inventory.FindFolderForType(AssetType.TrashFolder)].Data);
+                        (InventoryFolder)client.Inventory.Store.Items[client.Inventory.FindFolderForType(FolderType.Trash)].Data);
                 }
                 catch (Exception) { }
             }
diff --git a/Radegast/GUI/Rendering/PrimWorkshop.cs b/Radegast/GUI/Rendering/PrimWorkshop.cs
index 8d665c6..2686cd6 100644
--- a/Radegast/GUI/Rendering/PrimWorkshop.cs
+++ b/Radegast/GUI/Rendering/PrimWorkshop.cs
@@ -1221,7 +1221,7 @@ namespace Radegast.Rendering
             else
             {
                 instance.MediaManager.PlayUISound(UISounds.ObjectDelete);
-                Client.Inventory.RequestDeRezToInventory(RightclickedPrim.Prim.LocalID, DeRezDestination.AgentInventoryTake, Client.Inventory.FindFolderForType(AssetType.TrashFolder), UUID.Random());
+                Client.Inventory.RequestDeRezToInventory(RightclickedPrim.Prim.LocalID, DeRezDestination.AgentInventoryTake, Client.Inventory.FindFolderForType(FolderType.Trash), UUID.Random());
             }
             Close();
         }
diff --git a/Radegast/GUI/Rendering/RenderAvatar.cs b/Radegast/GUI/Rendering/RenderAvatar.cs
index f915414..bdcc323 100644
--- a/Radegast/GUI/Rendering/RenderAvatar.cs
+++ b/Radegast/GUI/Rendering/RenderAvatar.cs
@@ -288,7 +288,7 @@ namespace Radegast.Rendering
 
         }
 
-        public override void LoadLODMesh(int level, string filename)
+        public new void LoadLODMesh(int level, string filename)
         {
             LODMesh lod = new LODMesh();
             lod.LoadMesh(filename);
diff --git a/Radegast/GUI/Rendering/Rendering.cs b/Radegast/GUI/Rendering/Rendering.cs
index e76ae7f..94774f8 100644
--- a/Radegast/GUI/Rendering/Rendering.cs
+++ b/Radegast/GUI/Rendering/Rendering.cs
@@ -3115,7 +3115,7 @@ namespace Radegast.Rendering
                     item = new ToolStripMenuItem("Delete", null, (sender, e) =>
                     {
                         instance.MediaManager.PlayUISound(UISounds.ObjectDelete);
-                        Client.Inventory.RequestDeRezToInventory(prim.Prim.LocalID, DeRezDestination.AgentInventoryTake, Client.Inventory.FindFolderForType(AssetType.TrashFolder), UUID.Random());
+                        Client.Inventory.RequestDeRezToInventory(prim.Prim.LocalID, DeRezDestination.AgentInventoryTake, Client.Inventory.FindFolderForType(FolderType.Trash), UUID.Random());
                     });
                     ctxMenu.Items.Add(item);
 
diff --git a/Radegast/RadegastBuild.cs b/Radegast/RadegastBuild.cs
index e506973..aca5591 100644
--- a/Radegast/RadegastBuild.cs
+++ b/Radegast/RadegastBuild.cs
@@ -1,5 +1,5 @@
 // Autogenerated: run updatebuildnr.bat/sh to update 
 namespace Radegast 
-{
-    public static class RadegastBuild { public static int CurrentRev = 1466; } 
+{ 
+    public static class RadegastBuild { public static int CurrentRev = 1493; } 
 } 
diff --git a/libopenmetaverse b/libopenmetaverse
index 807c160..a2edf92 160000
--- a/libopenmetaverse
+++ b/libopenmetaverse
@@ -1 +1 @@
-Subproject commit 807c1608dd4afe4378cacbc62eec1b671013b837
+Subproject commit a2edf929d898f74a374585240415831ece9b54ad