aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--bin/OpenSimAssetSet.xml35
-rw-r--r--bin/OpenSimLibrary.xml63
5 files changed, 66 insertions, 54 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
diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml
index a8f3f11..8d93035 100644
--- a/bin/OpenSimAssetSet.xml
+++ b/bin/OpenSimAssetSet.xml
@@ -13,41 +13,6 @@
13 <Key Name="inventoryType" Value="0" /> 13 <Key Name="inventoryType" Value="0" />
14 <Key Name="fileName" Value="femaleface.jp2" /> 14 <Key Name="fileName" Value="femaleface.jp2" />
15 </Section> 15 </Section>
16 <Section Name="plywood Texture">
17 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000002" />
18 <Key Name="name" Value="plywood" />
19 <Key Name="assetType" Value="0" />
20 <Key Name="inventoryType" Value="0" />
21 <Key Name="fileName" Value="plywood.jp2" />
22 </Section>
23 <Section Name="rocks Texture">
24 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000003" />
25 <Key Name="name" Value="rocks" />
26 <Key Name="assetType" Value="0" />
27 <Key Name="inventoryType" Value="0" />
28 <Key Name="fileName" Value="rocks.jp2" />
29 </Section>
30 <Section Name="bricks Texture">
31 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000001" />
32 <Key Name="name" Value="bricks" />
33 <Key Name="assetType" Value="0" />
34 <Key Name="inventoryType" Value="0" />
35 <Key Name="fileName" Value="bricks.jp2" />
36 </Section>
37 <Section Name="granite Texture">
38 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000004" />
39 <Key Name="name" Value="granite" />
40 <Key Name="assetType" Value="0" />
41 <Key Name="inventoryType" Value="0" />
42 <Key Name="fileName" Value="granite.jp2" />
43 </Section>
44 <Section Name="hardwood Texture">
45 <Key Name="assetID" Value="00000000-0000-0000-9999-000000000005" />
46 <Key Name="name" Value="hardwood" />
47 <Key Name="assetType" Value="0" />
48 <Key Name="inventoryType" Value="0" />
49 <Key Name="fileName" Value="hardwood.jp2" />
50 </Section>
51 <Section Name="4-tile2 Texture"> 16 <Section Name="4-tile2 Texture">
52 <Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" /> 17 <Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" />
53 <Key Name="name" Value="4-tile2" /> 18 <Key Name="name" Value="4-tile2" />
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml
index 0ec23c5..d209635 100644
--- a/bin/OpenSimLibrary.xml
+++ b/bin/OpenSimLibrary.xml
@@ -539,4 +539,65 @@
539 <Key Name="everyonePermissions" Value="2147483647" /> 539 <Key Name="everyonePermissions" Value="2147483647" />
540 <Key Name="basePermissions" Value="2147483647" /> 540 <Key Name="basePermissions" Value="2147483647" />
541 </Section> 541 </Section>
542</Nini> \ No newline at end of file 542 <Section Name="bricks Texture">
543 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000001"/>
544 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
545 <Key Name="description" Value="bricks texture" />
546 <Key Name="name" Value="bricks" />
547 <Key Name="assetType" Value="0" />
548 <Key Name="inventoryType" Value="0" />
549 <Key Name="currentPermissions" Value="2147483647" />
550 <Key Name="nextPermissions" Value="2147483647" />
551 <Key Name="everyonePermissions" Value="2147483647" />
552 <Key Name="basePermissions" Value="2147483647" />
553 </Section>
554 <Section Name="granite Texture">
555 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000004"/>
556 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
557 <Key Name="description" Value="granite texture" />
558 <Key Name="name" Value="granite" />
559 <Key Name="assetType" Value="0" />
560 <Key Name="inventoryType" Value="0" />
561 <Key Name="currentPermissions" Value="2147483647" />
562 <Key Name="nextPermissions" Value="2147483647" />
563 <Key Name="everyonePermissions" Value="2147483647" />
564 <Key Name="basePermissions" Value="2147483647" />
565 </Section>
566 <Section Name="hardwood Texture">
567 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000005"/>
568 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
569 <Key Name="description" Value="hardwood texture" />
570 <Key Name="name" Value="hardwood" />
571 <Key Name="assetType" Value="0" />
572 <Key Name="inventoryType" Value="0" />
573 <Key Name="currentPermissions" Value="2147483647" />
574 <Key Name="nextPermissions" Value="2147483647" />
575 <Key Name="everyonePermissions" Value="2147483647" />
576 <Key Name="basePermissions" Value="2147483647" />
577 </Section>
578 <Section Name="plywood Texture">
579 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000002"/>
580 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/>
581 <Key Name="description" Value="plywood texture" />
582 <Key Name="name" Value="plywood" />
583 <Key Name="assetType" Value="0" />
584 <Key Name="inventoryType" Value="0" />
585 <Key Name="currentPermissions" Value="2147483647" />
586 <Key Name="nextPermissions" Value="2147483647" />
587 <Key Name="everyonePermissions" Value="2147483647" />
588 <Key Name="basePermissions" Value="2147483647" />
589 </Section>
590 <Section Name="rocks Texture">
591 <Key Name="inventoryID" Value="00000000-0000-1111-9999-000000000003"/>
592 <Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
593 <Key Name="description" Value="rocks texture" />
594 <Key Name="name" Value="rocks" />
595 <Key Name="assetType" Value="0" />
596 <Key Name="inventoryType" Value="0" />
597 <Key Name="currentPermissions" Value="2147483647" />
598 <Key Name="nextPermissions" Value="2147483647" />
599 <Key Name="everyonePermissions" Value="2147483647" />
600 <Key Name="basePermissions" Value="2147483647" />
601 </Section>
602
603</Nini>
generated by cgit v1.1 at 2024-11-10 08:36:15 +0000