diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | 27 |
2 files changed, 0 insertions, 44 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 2eb59d2..6d85477 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -177,23 +177,6 @@ namespace OpenSim.Framework.Communications.Caches | |||
177 | item.inventoryNextPermissions = 0; | 177 | item.inventoryNextPermissions = 0; |
178 | this.Items.Add(item.inventoryID, item); | 178 | this.Items.Add(item.inventoryID, item); |
179 | 179 | ||
180 | /* | ||
181 | item = new InventoryItemBase(); | ||
182 | item.avatarID = libOwner; | ||
183 | item.creatorsID = libOwner; | ||
184 | item.inventoryID = new LLUUID("00000000-0000-2222-4444-000000000001"); | ||
185 | item.assetID = new LLUUID("00000000-0000-2222-3333-000000000001"); | ||
186 | item.inventoryDescription = "Welcome"; | ||
187 | item.inventoryName = "Welcome"; | ||
188 | item.assetType = 7; | ||
189 | item.invType = 7; | ||
190 | item.parentFolderID = this.folderID; | ||
191 | item.inventoryCurrentPermissions = (1 << 15); | ||
192 | item.inventoryNextPermissions = (1 << 15); | ||
193 | item.inventoryEveryOnePermissions = (1 << 15); | ||
194 | item.inventoryBasePermissions = (1 << 15); | ||
195 | this.Items.Add(item.inventoryID, item); | ||
196 | */ | ||
197 | } | 180 | } |
198 | 181 | ||
199 | private void ReadItemsFromFile(IConfigSource source) | 182 | private void ReadItemsFromFile(IConfigSource source) |
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs index eecfcaf..a1cc10a 100644 --- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs +++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | |||
@@ -280,19 +280,6 @@ namespace OpenSim.Region.GridInterfaces.Local | |||
280 | db.Set(store); | 280 | db.Set(store); |
281 | db.Commit(); | 281 | db.Commit(); |
282 | 282 | ||
283 | |||
284 | /* | ||
285 | Image = new AssetBase(); | ||
286 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000008"); | ||
287 | Image.Name = "Default Avatar Face"; | ||
288 | this.LoadAsset(Image, true, "femaleface.j2c"); | ||
289 | store = new AssetStorage(); | ||
290 | store.Data = Image.Data; | ||
291 | store.Name = Image.Name; | ||
292 | store.UUID = Image.FullID; | ||
293 | db.Set(store); | ||
294 | db.Commit();*/ | ||
295 | |||
296 | Image = new AssetBase(); | 283 | Image = new AssetBase(); |
297 | Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); | 284 | Image.FullID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"); |
298 | Image.Name = "Skin"; | 285 | Image.Name = "Skin"; |
@@ -346,20 +333,6 @@ namespace OpenSim.Region.GridInterfaces.Local | |||
346 | db.Set(store); | 333 | db.Set(store); |
347 | db.Commit(); | 334 | db.Commit(); |
348 | 335 | ||
349 | /*Image = new AssetBase(); | ||
350 | Image.FullID = new LLUUID("00000000-0000-2222-3333-000000000001"); | ||
351 | Image.Name = "WelcomeNote"; | ||
352 | Image.Type = 7; | ||
353 | Image.InvType = 7; | ||
354 | this.LoadAsset(Image, false, "welcomeNote.dat"); | ||
355 | store = new AssetStorage(); | ||
356 | store.Data = Image.Data; | ||
357 | store.Name = Image.Name; | ||
358 | store.UUID = Image.FullID; | ||
359 | db.Set(store); | ||
360 | db.Commit(); | ||
361 | */ | ||
362 | |||
363 | string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); | 336 | string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); |
364 | if(File.Exists(filePath)) | 337 | if(File.Exists(filePath)) |
365 | { | 338 | { |