aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs17
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs4
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs1
3 files changed, 4 insertions, 18 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index ffc94bf..4c8eddf 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -81,22 +81,7 @@ namespace OpenSim.Framework.Communications.Cache
81 81
82 private void CreateLibraryItems() 82 private void CreateLibraryItems()
83 { 83 {
84 InventoryItemBase item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000002"), "Plywood", "Plywood texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID); 84 InventoryItemBase item = CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", (int)AssetType.Bodypart, (int)InventoryType.Wearable, folderID);
85 m_textureFolder.Items.Add(item.inventoryID, item);
86
87 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000003"), "Rocks", "Rocks texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
88 m_textureFolder.Items.Add(item.inventoryID, item);
89
90 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000001"), "Bricks", "Bricks texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
91 m_textureFolder.Items.Add(item.inventoryID, item);
92
93 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000004"), "Granite", "Granite texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
94 m_textureFolder.Items.Add(item.inventoryID, item);
95
96 item = CreateItem(LLUUID.Random(), new LLUUID("00000000-0000-0000-9999-000000000005"), "Hardwood", "Hardwood texture", (int)AssetType.Texture, (int)InventoryType.Texture, m_textureFolder.folderID);
97 m_textureFolder.Items.Add(item.inventoryID, item);
98
99 item = CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", (int)AssetType.Bodypart, (int)InventoryType.Wearable, folderID);
100 item.inventoryCurrentPermissions = 0; 85 item.inventoryCurrentPermissions = 0;
101 item.inventoryNextPermissions = 0; 86 item.inventoryNextPermissions = 0;
102 Items.Add(item.inventoryID, item); 87 Items.Add(item.inventoryID, item);
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 6384408..0797a84 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
53 { 53 {
54 if (!String.IsNullOrEmpty(FileName)) 54 if (!String.IsNullOrEmpty(FileName))
55 { 55 {
56 MainLog.Instance.Verbose("Inventory", "Inventorystorage: Attempting to load " + FileName); 56 MainLog.Instance.Verbose("AGENTINVENTORY", "Inventorystorage: Attempting to load " + FileName);
57 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 57 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
58 58
59 foreach (Type pluginType in pluginAssembly.GetTypes()) 59 foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications
68 (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 68 (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
69 plug.Initialise(); 69 plug.Initialise();
70 m_plugins.Add(plug.getName(), plug); 70 m_plugins.Add(plug.getName(), plug);
71 MainLog.Instance.Verbose("INVENTORY", "Added IInventoryData Interface"); 71 MainLog.Instance.Verbose("AGENTINVENTORY", "Added IInventoryData Interface");
72 } 72 }
73 } 73 }
74 } 74 }
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 58dab9b..6d4cb68 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -277,6 +277,7 @@ namespace OpenSim.Framework.UserManagement
277 TempHash["type_default"] = -1; 277 TempHash["type_default"] = -1;
278 TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001"; 278 TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba001";
279 temp.Add(TempHash); 279 temp.Add(TempHash);
280
280 return temp; 281 return temp;
281 } 282 }
282 283