OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Remove pointless boolean on AgentInventory.CreateRootFolder()

0.6.0-stable
Justin Clarke Casey 2008-03-28 16:27:29 +00:00
parent a13d68d98c
commit 512e52be4c
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/AgentInventory.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Framework
return (true); return (true);
} }
public void CreateRootFolder(LLUUID newAgentID, bool createTextures) public void CreateRootFolder(LLUUID newAgentID)
{ {
AgentID = newAgentID; AgentID = newAgentID;
InventoryRoot = new InventoryFolder(); InventoryRoot = new InventoryFolder();
@ -79,10 +79,6 @@ namespace OpenSim.Framework
InventoryRoot.FolderName = "My Inventory"; InventoryRoot.FolderName = "My Inventory";
InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
InventoryRoot.OwnerID = AgentID; InventoryRoot.OwnerID = AgentID;
if (createTextures)
{
CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);
}
} }
public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName) public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName)

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Framework.Communications
{ {
if (!String.IsNullOrEmpty(FileName)) 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); Assembly pluginAssembly = Assembly.LoadFrom(FileName);
foreach (Type pluginType in pluginAssembly.GetTypes()) foreach (Type pluginType in pluginAssembly.GetTypes())

2
OpenSim/Framework/Communications/LoginService.cs
View File

@ -757,7 +757,7 @@ namespace OpenSim.Framework.UserManagement
protected virtual InventoryData CreateInventoryData(LLUUID userID) protected virtual InventoryData CreateInventoryData(LLUUID userID)
{ {
AgentInventory userInventory = new AgentInventory(); AgentInventory userInventory = new AgentInventory();
userInventory.CreateRootFolder(userID, false); userInventory.CreateRootFolder(userID);
ArrayList AgentInventoryArray = new ArrayList(); ArrayList AgentInventoryArray = new ArrayList();
Hashtable TempHash; Hashtable TempHash;

2
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -342,7 +342,7 @@ namespace OpenSim.Grid.UserServer
" for user ID " + userID); " for user ID " + userID);
AgentInventory userInventory = new AgentInventory(); AgentInventory userInventory = new AgentInventory();
userInventory.CreateRootFolder(userID, false); userInventory.CreateRootFolder(userID);
ArrayList AgentInventoryArray = new ArrayList(); ArrayList AgentInventoryArray = new ArrayList();
Hashtable TempHash; Hashtable TempHash;

2
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -239,7 +239,7 @@ namespace OpenSim.Region.Communications.Local
else else
{ {
AgentInventory userInventory = new AgentInventory(); AgentInventory userInventory = new AgentInventory();
userInventory.CreateRootFolder(userID, false); userInventory.CreateRootFolder(userID);
ArrayList AgentInventoryArray = new ArrayList(); ArrayList AgentInventoryArray = new ArrayList();
Hashtable TempHash; Hashtable TempHash;