diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 03036d0..a39738d 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -28,10 +28,11 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | ||
31 | using System.Xml; | 32 | using System.Xml; |
32 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
33 | using Nini.Config; | 35 | using Nini.Config; |
34 | using OpenSim.Framework.Console; | ||
35 | 36 | ||
36 | namespace OpenSim.Framework.Communications.Cache | 37 | namespace OpenSim.Framework.Communications.Cache |
37 | { | 38 | { |
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
41 | /// </summary> | 42 | /// </summary> |
42 | public class LibraryRootFolder : InventoryFolderImpl | 43 | public class LibraryRootFolder : InventoryFolderImpl |
43 | { | 44 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 46 | ||
46 | private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); | 47 | private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); |
47 | 48 | ||
@@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
153 | { | 154 | { |
154 | string foldersPath | 155 | string foldersPath |
155 | = Path.Combine( | 156 | = Path.Combine( |
156 | Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty)); | 157 | Util.inventoryDir(), config.GetString("foldersFile", String.Empty)); |
157 | 158 | ||
158 | LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); | 159 | LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); |
159 | 160 | ||
160 | string itemsPath | 161 | string itemsPath |
161 | = Path.Combine( | 162 | = Path.Combine( |
162 | Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty)); | 163 | Util.inventoryDir(), config.GetString("itemsFile", String.Empty)); |
163 | 164 | ||
164 | LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); | 165 | LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); |
165 | } | 166 | } |
@@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
209 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); | 210 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); |
210 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); | 211 | item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); |
211 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); | 212 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); |
212 | item.Description = config.GetString("description", System.String.Empty); | 213 | item.Description = config.GetString("description", String.Empty); |
213 | item.Name = config.GetString("name", System.String.Empty); | 214 | item.Name = config.GetString("name", String.Empty); |
214 | item.AssetType = config.GetInt("assetType", 0); | 215 | item.AssetType = config.GetInt("assetType", 0); |
215 | item.InvType = config.GetInt("inventoryType", 0); | 216 | item.InvType = config.GetInt("inventoryType", 0); |
216 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); | 217 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); |