From 512e52be4cd0c942105ef5bec71ac8b78ffe02c1 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 28 Mar 2008 16:27:29 +0000
Subject: * Remove pointless boolean on AgentInventory.CreateRootFolder()

---
 OpenSim/Framework/AgentInventory.cs                      | 6 +-----
 OpenSim/Framework/Communications/InventoryServiceBase.cs | 2 +-
 OpenSim/Framework/Communications/LoginService.cs         | 2 +-
 OpenSim/Grid/UserServer/UserLoginService.cs              | 2 +-
 OpenSim/Region/Communications/Local/LocalLoginService.cs | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index aa56be1..916cdf8 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
             return (true);
         }
 
-        public void CreateRootFolder(LLUUID newAgentID, bool createTextures)
+        public void CreateRootFolder(LLUUID newAgentID)
         {
             AgentID = newAgentID;
             InventoryRoot = new InventoryFolder();
@@ -79,10 +79,6 @@ namespace OpenSim.Framework
             InventoryRoot.FolderName = "My Inventory";
             InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
             InventoryRoot.OwnerID = AgentID;
-            if (createTextures)
-            {
-                CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);
-            }
         }
 
         public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName)
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index b73340c..78de4a5 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Communications
         {
             if (!String.IsNullOrEmpty(FileName))
             {
-                m_log.Info("[AGENTINVENTORY]: Inventorystorage: Attempting to load " + FileName);
+                m_log.Info("[AGENTINVENTORY]: Inventory storage: Attempting to load " + FileName);
                 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
                 foreach (Type pluginType in pluginAssembly.GetTypes())
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index c04e8b9..2286b59 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -757,7 +757,7 @@ namespace OpenSim.Framework.UserManagement
         protected virtual InventoryData CreateInventoryData(LLUUID userID)
         {
             AgentInventory userInventory = new AgentInventory();
-            userInventory.CreateRootFolder(userID, false);
+            userInventory.CreateRootFolder(userID);
 
             ArrayList AgentInventoryArray = new ArrayList();
             Hashtable TempHash;
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 60408ff..1a97cd2 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Grid.UserServer
                            " for user ID " + userID);
 
                 AgentInventory userInventory = new AgentInventory();
-                userInventory.CreateRootFolder(userID, false);
+                userInventory.CreateRootFolder(userID);
 
                 ArrayList AgentInventoryArray = new ArrayList();
                 Hashtable TempHash;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 6f12601..7b30727 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Region.Communications.Local
             else
             {
                 AgentInventory userInventory = new AgentInventory();
-                userInventory.CreateRootFolder(userID, false);
+                userInventory.CreateRootFolder(userID);
 
                 ArrayList AgentInventoryArray = new ArrayList();
                 Hashtable TempHash;
-- 
cgit v1.1