aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-07-25 19:18:34 +0000
committerMW2007-07-25 19:18:34 +0000
commit74654dc7351baf092ecae12c90a236ec43c86c98 (patch)
treebfff64c22423a0949bb298f676685c84a8257732 /OpenSim/Framework
parentStart of the OpenSim library , for now only contains a few textures. (diff)
downloadopensim-SC_OLD-74654dc7351baf092ecae12c90a236ec43c86c98.zip
opensim-SC_OLD-74654dc7351baf092ecae12c90a236ec43c86c98.tar.gz
opensim-SC_OLD-74654dc7351baf092ecae12c90a236ec43c86c98.tar.bz2
opensim-SC_OLD-74654dc7351baf092ecae12c90a236ec43c86c98.tar.xz
Added the default shape to the OpenSim library. Now need to get the new ruth into asset format and add that.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs50
-rw-r--r--OpenSim/Framework/Data/InventoryData.cs8
-rw-r--r--OpenSim/Framework/General/Types/AgentWearable.cs2
3 files changed, 48 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 2608145..18803c0 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -19,6 +19,11 @@ namespace OpenSim.Framework.Communications.Caches
19 this.type = (short)-1; 19 this.type = (short)-1;
20 this.version = (ushort) 1; 20 this.version = (ushort) 1;
21 21
22 this.CreateLibraryItems();
23 }
24
25 private void CreateLibraryItems()
26 {
22 InventoryItemBase item = new InventoryItemBase(); 27 InventoryItemBase item = new InventoryItemBase();
23 item.avatarID = libOwner; 28 item.avatarID = libOwner;
24 item.creatorsID = libOwner; 29 item.creatorsID = libOwner;
@@ -26,10 +31,12 @@ namespace OpenSim.Framework.Communications.Caches
26 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002"); 31 item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002");
27 item.inventoryDescription = "Plywood texture"; 32 item.inventoryDescription = "Plywood texture";
28 item.inventoryName = "Plywood"; 33 item.inventoryName = "Plywood";
29 item.type =0; 34 item.type = 0;
30 item.parentFolderID = this.folderID; 35 item.parentFolderID = this.folderID;
31 item.inventoryCurrentPermissions = 2147483647; 36 item.inventoryBasePermissions = 0x7FFFFFFF;
32 item.inventoryNextPermissions = 2147483647; 37 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
38 item.inventoryCurrentPermissions = 0x7FFFFFFF;
39 item.inventoryNextPermissions = 0x7FFFFFFF;
33 this.Items.Add(item.inventoryID, item); 40 this.Items.Add(item.inventoryID, item);
34 41
35 item = new InventoryItemBase(); 42 item = new InventoryItemBase();
@@ -41,8 +48,10 @@ namespace OpenSim.Framework.Communications.Caches
41 item.inventoryName = "Rocks"; 48 item.inventoryName = "Rocks";
42 item.type = 0; 49 item.type = 0;
43 item.parentFolderID = this.folderID; 50 item.parentFolderID = this.folderID;
44 item.inventoryCurrentPermissions = 2147483647; 51 item.inventoryBasePermissions = 0x7FFFFFFF;
45 item.inventoryNextPermissions = 2147483647; 52 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
53 item.inventoryCurrentPermissions = 0x7FFFFFFF;
54 item.inventoryNextPermissions = 0x7FFFFFFF;
46 this.Items.Add(item.inventoryID, item); 55 this.Items.Add(item.inventoryID, item);
47 56
48 item = new InventoryItemBase(); 57 item = new InventoryItemBase();
@@ -54,8 +63,10 @@ namespace OpenSim.Framework.Communications.Caches
54 item.inventoryName = "Bricks"; 63 item.inventoryName = "Bricks";
55 item.type = 0; 64 item.type = 0;
56 item.parentFolderID = this.folderID; 65 item.parentFolderID = this.folderID;
57 item.inventoryCurrentPermissions = 2147483647; 66 item.inventoryBasePermissions = 0x7FFFFFFF;
58 item.inventoryNextPermissions = 2147483647; 67 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
68 item.inventoryCurrentPermissions = 0x7FFFFFFF;
69 item.inventoryNextPermissions = 0x7FFFFFFF;
59 this.Items.Add(item.inventoryID, item); 70 this.Items.Add(item.inventoryID, item);
60 71
61 item = new InventoryItemBase(); 72 item = new InventoryItemBase();
@@ -67,8 +78,10 @@ namespace OpenSim.Framework.Communications.Caches
67 item.inventoryName = "Granite"; 78 item.inventoryName = "Granite";
68 item.type = 0; 79 item.type = 0;
69 item.parentFolderID = this.folderID; 80 item.parentFolderID = this.folderID;
70 item.inventoryCurrentPermissions = 2147483647; 81 item.inventoryBasePermissions = 0x7FFFFFFF;
71 item.inventoryNextPermissions = 2147483647; 82 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
83 item.inventoryCurrentPermissions = 0x7FFFFFFF;
84 item.inventoryNextPermissions = 0x7FFFFFFF;
72 this.Items.Add(item.inventoryID, item); 85 this.Items.Add(item.inventoryID, item);
73 86
74 item = new InventoryItemBase(); 87 item = new InventoryItemBase();
@@ -80,8 +93,23 @@ namespace OpenSim.Framework.Communications.Caches
80 item.inventoryName = "Hardwood"; 93 item.inventoryName = "Hardwood";
81 item.type = 0; 94 item.type = 0;
82 item.parentFolderID = this.folderID; 95 item.parentFolderID = this.folderID;
83 item.inventoryCurrentPermissions = 2147483647; 96 item.inventoryBasePermissions = 0x7FFFFFFF;
84 item.inventoryNextPermissions = 2147483647; 97 item.inventoryEveryOnePermissions = 0x7FFFFFFF;
98 item.inventoryCurrentPermissions = 0x7FFFFFFF;
99 item.inventoryNextPermissions = 0x7FFFFFFF;
100 this.Items.Add(item.inventoryID, item);
101
102 item = new InventoryItemBase();
103 item.avatarID = libOwner;
104 item.creatorsID = libOwner;
105 item.inventoryID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
106 item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
107 item.inventoryDescription = "Default Shape";
108 item.inventoryName = "Default Shape";
109 item.type = 13;
110 item.parentFolderID = this.folderID;
111 item.inventoryCurrentPermissions = 0;
112 item.inventoryNextPermissions = 0;
85 this.Items.Add(item.inventoryID, item); 113 this.Items.Add(item.inventoryID, item);
86 } 114 }
87 115
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index d7130f4..c43ff1a 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -75,6 +75,14 @@ namespace OpenSim.Framework.Data
75 /// A mask containing permissions for the current owner (cannot be enforced) 75 /// A mask containing permissions for the current owner (cannot be enforced)
76 /// </summary> 76 /// </summary>
77 public uint inventoryCurrentPermissions; 77 public uint inventoryCurrentPermissions;
78 /// <summary>
79 ///
80 /// </summary>
81 public uint inventoryBasePermissions;
82 /// <summary>
83 ///
84 /// </summary>
85 public uint inventoryEveryOnePermissions;
78 } 86 }
79 87
80 /// <summary> 88 /// <summary>
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 404df0d..9de25b5 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Types
49 defaultWearables[i] = new AvatarWearable(); 49 defaultWearables[i] = new AvatarWearable();
50 } 50 }
51 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 51 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
52 defaultWearables[0].ItemID = LLUUID.Random(); 52 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
53 return defaultWearables; 53 return defaultWearables;
54 } 54 }
55 } 55 }
generated by cgit v1.1 at 2024-07-08 12:04:47 +0000