diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |
parent | * removed always true if (diff) | |
download | opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 4c8eddf..fd93b19 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -49,8 +49,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
49 | folderID = new LLUUID("00000112-000f-0000-0000-000100bba000"); | 49 | folderID = new LLUUID("00000112-000f-0000-0000-000100bba000"); |
50 | name = "OpenSim Library"; | 50 | name = "OpenSim Library"; |
51 | parentID = LLUUID.Zero; | 51 | parentID = LLUUID.Zero; |
52 | type = (short)-1; | 52 | type = (short) -1; |
53 | version = (ushort)1; | 53 | version = (ushort) 1; |
54 | 54 | ||
55 | InventoryFolderImpl folderInfo = new InventoryFolderImpl(); | 55 | InventoryFolderImpl folderInfo = new InventoryFolderImpl(); |
56 | folderInfo.agentID = libOwner; | 56 | folderInfo.agentID = libOwner; |
@@ -81,28 +81,41 @@ namespace OpenSim.Framework.Communications.Cache | |||
81 | 81 | ||
82 | private void CreateLibraryItems() | 82 | private void CreateLibraryItems() |
83 | { | 83 | { |
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); | 84 | InventoryItemBase item = |
85 | CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), | ||
86 | new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", | ||
87 | (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); | ||
85 | item.inventoryCurrentPermissions = 0; | 88 | item.inventoryCurrentPermissions = 0; |
86 | item.inventoryNextPermissions = 0; | 89 | item.inventoryNextPermissions = 0; |
87 | Items.Add(item.inventoryID, item); | 90 | Items.Add(item.inventoryID, item); |
88 | 91 | ||
89 | item = CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", (int)AssetType.Bodypart, (int)InventoryType.Wearable, folderID); | 92 | item = |
93 | CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), | ||
94 | new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", | ||
95 | (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); | ||
90 | item.inventoryCurrentPermissions = 0; | 96 | item.inventoryCurrentPermissions = 0; |
91 | item.inventoryNextPermissions = 0; | 97 | item.inventoryNextPermissions = 0; |
92 | Items.Add(item.inventoryID, item); | 98 | Items.Add(item.inventoryID, item); |
93 | 99 | ||
94 | item = CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", (int)AssetType.Clothing, (int)InventoryType.Wearable, folderID); | 100 | item = |
101 | CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), | ||
102 | new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", | ||
103 | (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); | ||
95 | item.inventoryCurrentPermissions = 0; | 104 | item.inventoryCurrentPermissions = 0; |
96 | item.inventoryNextPermissions = 0; | 105 | item.inventoryNextPermissions = 0; |
97 | Items.Add(item.inventoryID, item); | 106 | Items.Add(item.inventoryID, item); |
98 | 107 | ||
99 | item = CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", (int)AssetType.Clothing, (int)InventoryType.Wearable, folderID); | 108 | item = |
109 | CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), | ||
110 | new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", | ||
111 | (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); | ||
100 | item.inventoryCurrentPermissions = 0; | 112 | item.inventoryCurrentPermissions = 0; |
101 | item.inventoryNextPermissions = 0; | 113 | item.inventoryNextPermissions = 0; |
102 | Items.Add(item.inventoryID, item); | 114 | Items.Add(item.inventoryID, item); |
103 | } | 115 | } |
104 | 116 | ||
105 | public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, int assetType, int invType, LLUUID parentFolderID) | 117 | public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, |
118 | int assetType, int invType, LLUUID parentFolderID) | ||
106 | { | 119 | { |
107 | InventoryItemBase item = new InventoryItemBase(); | 120 | InventoryItemBase item = new InventoryItemBase(); |
108 | item.avatarID = libOwner; | 121 | item.avatarID = libOwner; |
@@ -135,10 +148,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
135 | item.inventoryName = source.Configs[i].GetString("name", ""); | 148 | item.inventoryName = source.Configs[i].GetString("name", ""); |
136 | item.assetType = source.Configs[i].GetInt("assetType", 0); | 149 | item.assetType = source.Configs[i].GetInt("assetType", 0); |
137 | item.invType = source.Configs[i].GetInt("inventoryType", 0); | 150 | item.invType = source.Configs[i].GetInt("inventoryType", 0); |
138 | item.inventoryCurrentPermissions = (uint)source.Configs[i].GetLong("currentPermissions", 0x7FFFFFFF); | 151 | item.inventoryCurrentPermissions = (uint) source.Configs[i].GetLong("currentPermissions", 0x7FFFFFFF); |
139 | item.inventoryNextPermissions = (uint)source.Configs[i].GetLong("nextPermissions", 0x7FFFFFFF); | 152 | item.inventoryNextPermissions = (uint) source.Configs[i].GetLong("nextPermissions", 0x7FFFFFFF); |
140 | item.inventoryEveryOnePermissions = (uint)source.Configs[i].GetLong("everyonePermissions", 0x7FFFFFFF); | 153 | item.inventoryEveryOnePermissions = (uint) source.Configs[i].GetLong("everyonePermissions", 0x7FFFFFFF); |
141 | item.inventoryBasePermissions = (uint)source.Configs[i].GetLong("basePermissions", 0x7FFFFFFF); | 154 | item.inventoryBasePermissions = (uint) source.Configs[i].GetLong("basePermissions", 0x7FFFFFFF); |
142 | if (item.assetType == 0) | 155 | if (item.assetType == 0) |
143 | { | 156 | { |
144 | item.parentFolderID = m_textureFolder.folderID; | 157 | item.parentFolderID = m_textureFolder.folderID; |
@@ -152,4 +165,4 @@ namespace OpenSim.Framework.Communications.Cache | |||
152 | } | 165 | } |
153 | } | 166 | } |
154 | } | 167 | } |
155 | } | 168 | } \ No newline at end of file |