diff options
author | Justin Clarke Casey | 2008-03-28 16:27:29 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-28 16:27:29 +0000 |
commit | 512e52be4cd0c942105ef5bec71ac8b78ffe02c1 (patch) | |
tree | 4d82df98acfbdc26da0433a2f4a456d41203fc8e | |
parent | fixes mantis #778 and shoots himself for making such a mistake to begin with,... (diff) | |
download | opensim-SC-512e52be4cd0c942105ef5bec71ac8b78ffe02c1.zip opensim-SC-512e52be4cd0c942105ef5bec71ac8b78ffe02c1.tar.gz opensim-SC-512e52be4cd0c942105ef5bec71ac8b78ffe02c1.tar.bz2 opensim-SC-512e52be4cd0c942105ef5bec71ac8b78ffe02c1.tar.xz |
* Remove pointless boolean on AgentInventory.CreateRootFolder()
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 | |||
67 | return (true); | 67 | return (true); |
68 | } | 68 | } |
69 | 69 | ||
70 | public void CreateRootFolder(LLUUID newAgentID, bool createTextures) | 70 | public void CreateRootFolder(LLUUID newAgentID) |
71 | { | 71 | { |
72 | AgentID = newAgentID; | 72 | AgentID = newAgentID; |
73 | InventoryRoot = new InventoryFolder(); | 73 | InventoryRoot = new InventoryFolder(); |
@@ -79,10 +79,6 @@ namespace OpenSim.Framework | |||
79 | InventoryRoot.FolderName = "My Inventory"; | 79 | InventoryRoot.FolderName = "My Inventory"; |
80 | InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); | 80 | InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); |
81 | InventoryRoot.OwnerID = AgentID; | 81 | InventoryRoot.OwnerID = AgentID; |
82 | if (createTextures) | ||
83 | { | ||
84 | CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID); | ||
85 | } | ||
86 | } | 82 | } |
87 | 83 | ||
88 | public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName) | 84 | 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 | |||
50 | { | 50 | { |
51 | if (!String.IsNullOrEmpty(FileName)) | 51 | if (!String.IsNullOrEmpty(FileName)) |
52 | { | 52 | { |
53 | m_log.Info("[AGENTINVENTORY]: Inventorystorage: Attempting to load " + FileName); | 53 | m_log.Info("[AGENTINVENTORY]: Inventory storage: Attempting to load " + FileName); |
54 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 54 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
55 | 55 | ||
56 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 56 | 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 | |||
757 | protected virtual InventoryData CreateInventoryData(LLUUID userID) | 757 | protected virtual InventoryData CreateInventoryData(LLUUID userID) |
758 | { | 758 | { |
759 | AgentInventory userInventory = new AgentInventory(); | 759 | AgentInventory userInventory = new AgentInventory(); |
760 | userInventory.CreateRootFolder(userID, false); | 760 | userInventory.CreateRootFolder(userID); |
761 | 761 | ||
762 | ArrayList AgentInventoryArray = new ArrayList(); | 762 | ArrayList AgentInventoryArray = new ArrayList(); |
763 | Hashtable TempHash; | 763 | 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 | |||
342 | " for user ID " + userID); | 342 | " for user ID " + userID); |
343 | 343 | ||
344 | AgentInventory userInventory = new AgentInventory(); | 344 | AgentInventory userInventory = new AgentInventory(); |
345 | userInventory.CreateRootFolder(userID, false); | 345 | userInventory.CreateRootFolder(userID); |
346 | 346 | ||
347 | ArrayList AgentInventoryArray = new ArrayList(); | 347 | ArrayList AgentInventoryArray = new ArrayList(); |
348 | Hashtable TempHash; | 348 | 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 | |||
239 | else | 239 | else |
240 | { | 240 | { |
241 | AgentInventory userInventory = new AgentInventory(); | 241 | AgentInventory userInventory = new AgentInventory(); |
242 | userInventory.CreateRootFolder(userID, false); | 242 | userInventory.CreateRootFolder(userID); |
243 | 243 | ||
244 | ArrayList AgentInventoryArray = new ArrayList(); | 244 | ArrayList AgentInventoryArray = new ArrayList(); |
245 | Hashtable TempHash; | 245 | Hashtable TempHash; |