diff options
author | Adam Frisby | 2008-01-15 02:09:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-01-15 02:09:55 +0000 |
commit | b25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch) | |
tree | 7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |
parent | Set svn:eol-style. (diff) | |
download | opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2 opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz |
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's
* Added Copyright headers to a bunch of files missing them
* Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 46ae9ce..ae07898 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -152,13 +152,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
152 | { | 152 | { |
153 | string foldersPath | 153 | string foldersPath |
154 | = Path.Combine( | 154 | = Path.Combine( |
155 | Util.inventoryDir(), config.GetString("foldersFile", "")); | 155 | Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty)); |
156 | 156 | ||
157 | LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); | 157 | LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); |
158 | 158 | ||
159 | string itemsPath | 159 | string itemsPath |
160 | = Path.Combine( | 160 | = Path.Combine( |
161 | Util.inventoryDir(), config.GetString("itemsFile", "")); | 161 | Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty)); |
162 | 162 | ||
163 | LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); | 163 | LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); |
164 | } | 164 | } |
@@ -210,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
210 | item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); | 210 | item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); |
211 | item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); | 211 | item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); |
212 | item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString())); | 212 | item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString())); |
213 | item.inventoryDescription = config.GetString("description", ""); | 213 | item.inventoryDescription = config.GetString("description", System.String.Empty); |
214 | item.inventoryName = config.GetString("name", ""); | 214 | item.inventoryName = config.GetString("name", System.String.Empty); |
215 | item.assetType = config.GetInt("assetType", 0); | 215 | item.assetType = config.GetInt("assetType", 0); |
216 | item.invType = config.GetInt("inventoryType", 0); | 216 | item.invType = config.GetInt("inventoryType", 0); |
217 | item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); | 217 | item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); |