diff options
author | Sean Dague | 2008-06-02 20:28:26 +0000 |
---|---|---|
committer | Sean Dague | 2008-06-02 20:28:26 +0000 |
commit | 5f6b26d9ba20ef41ead8ecc178c624c9f187fdd1 (patch) | |
tree | a4f8cea2d2a9d0fec9b7702f6525cffd591456db | |
parent | remove the prolog parser from all LSL/C# scripts (it was adding overhead (diff) | |
download | opensim-SC_OLD-5f6b26d9ba20ef41ead8ecc178c624c9f187fdd1.zip opensim-SC_OLD-5f6b26d9ba20ef41ead8ecc178c624c9f187fdd1.tar.gz opensim-SC_OLD-5f6b26d9ba20ef41ead8ecc178c624c9f187fdd1.tar.bz2 opensim-SC_OLD-5f6b26d9ba20ef41ead8ecc178c624c9f187fdd1.tar.xz |
provide slightly more sane defaults in the file based asset loader
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 6 |
1 files 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 | |||
208 | item.Owner = libOwner; | 208 | item.Owner = libOwner; |
209 | item.Creator = libOwner; | 209 | item.Creator = libOwner; |
210 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); | 210 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); |
211 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); | 211 | item.AssetID = new LLUUID(config.GetString("assetID", item.ID.ToString())); |
212 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); | 212 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); |
213 | item.Description = config.GetString("description", String.Empty); | ||
214 | item.Name = config.GetString("name", String.Empty); | 213 | item.Name = config.GetString("name", String.Empty); |
215 | item.AssetType = config.GetInt("assetType", 0); | 214 | item.Description = config.GetString("description", item.Name); |
216 | item.InvType = config.GetInt("inventoryType", 0); | 215 | item.InvType = config.GetInt("inventoryType", 0); |
216 | item.AssetType = config.GetInt("assetType", item.InvType); | ||
217 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); | 217 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); |
218 | item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF); | 218 | item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF); |
219 | item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF); | 219 | item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF); |