aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetLoader
diff options
context:
space:
mode:
authorAdam Frisby2008-01-15 02:09:55 +0000
committerAdam Frisby2008-01-15 02:09:55 +0000
commitb25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch)
tree7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Framework/AssetLoader
parentSet svn:eol-style. (diff)
downloadopensim-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/AssetLoader')
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index d6ce0c5..59db3d6 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
99 99
100 for (int i = 0; i < source.Configs.Count; i++) 100 for (int i = 0; i < source.Configs.Count; i++)
101 { 101 {
102 assetSetPath = source.Configs[i].GetString("file", ""); 102 assetSetPath = source.Configs[i].GetString("file", String.Empty);
103 103
104 LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets); 104 LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets);
105 } 105 }
@@ -138,10 +138,10 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
138 for (int i = 0; i < source.Configs.Count; i++) 138 for (int i = 0; i < source.Configs.Count; i++)
139 { 139 {
140 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); 140 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
141 string name = source.Configs[i].GetString("name", ""); 141 string name = source.Configs[i].GetString("name", String.Empty);
142 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 142 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
143 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); 143 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
144 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", "")); 144 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
145 145
146 AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false); 146 AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false);
147 147