* Patch from Charlie Omega for standard secondlife inventory folders: see mantis:0000246

* Deletes the solution file from OpenSim.Gui

2 files changed, 103 insertions, 24 deletions

diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 1e13031..6384408 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -241,8 +241,71 @@ namespace OpenSim.Framework.Communications
                 folder.parentID = rootFolder;
                 folder.agentID = user;
                 folder.folderID = LLUUID.Random();
-                folder.name = "Textures";
-                folder.type = 0;
+                folder.name = "Accessories";
+                folder.type = 8;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Animations";
+                folder.type = 20;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "BodyParts";
+                folder.type = 13;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Clothing";
+                folder.type = 5;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Gestures";
+                folder.type = 21;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Landmarks";
+                folder.type = 3;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Lost And Found";
+                folder.type = 3;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Notecards";
+                folder.type = 7;
                 folder.version = 1;
                 Folders.Add(folder.folderID, folder);
 
@@ -259,8 +322,44 @@ namespace OpenSim.Framework.Communications
                 folder.parentID = rootFolder;
                 folder.agentID = user;
                 folder.folderID = LLUUID.Random();
-                folder.name = "Clothes";
-                folder.type = 5;
+                folder.name = "Photo Album";
+                folder.type = 15;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Scripts";
+                folder.type = 10;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Sounds";
+                folder.type = 1;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Textures";
+                folder.type = 0;
+                folder.version = 1;
+                Folders.Add(folder.folderID, folder);
+
+                folder = new InventoryFolderBase();
+                folder.parentID = rootFolder;
+                folder.agentID = user;
+                folder.folderID = LLUUID.Random();
+                folder.name = "Trash";
+                folder.type = 14;
                 folder.version = 1;
                 Folders.Add(folder.folderID, folder);
             }
diff --git a/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.sln b/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.sln
deleted file mode 100644
index 6cdad46..0000000
--- a/OpenSim/Tools/OpenSim.GUI/OpenSim.GUI.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-?
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GUI", "OpenSim.GUI.csproj", "{78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Release|Any CPU = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {78AEEDD5-4DA8-4E05-8D53-F3C5476A0B97}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-EndGlobal