From 5f6b26d9ba20ef41ead8ecc178c624c9f187fdd1 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 2 Jun 2008 20:28:26 +0000
Subject: provide slightly more sane defaults in the file based asset loader
---
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index ca7eb13..1ff6350 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -208,12 +208,12 @@ namespace OpenSim.Framework.Communications.Cache
item.Owner = libOwner;
item.Creator = libOwner;
item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString()));
- item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
+ item.AssetID = new LLUUID(config.GetString("assetID", item.ID.ToString()));
item.Folder = new LLUUID(config.GetString("folderID", ID.ToString()));
- item.Description = config.GetString("description", String.Empty);
item.Name = config.GetString("name", String.Empty);
- item.AssetType = config.GetInt("assetType", 0);
+ item.Description = config.GetString("description", item.Name);
item.InvType = config.GetInt("inventoryType", 0);
+ item.AssetType = config.GetInt("assetType", item.InvType);
item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF);
item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF);
--
cgit v1.1