diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Framework/SLUtil.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/SLUtil.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs index e66d5be..9458625 100644 --- a/OpenSim/Framework/SLUtil.cs +++ b/OpenSim/Framework/SLUtil.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Framework | |||
44 | Material = -2 | 44 | Material = -2 |
45 | } | 45 | } |
46 | 46 | ||
47 | 47 | ||
48 | #region SL / file extension / content-type conversions | 48 | #region SL / file extension / content-type conversions |
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
@@ -175,10 +175,10 @@ namespace OpenSim.Framework | |||
175 | new TypeMapping(AssetType.Folder, FolderType.CurrentOutfit, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"), | 175 | new TypeMapping(AssetType.Folder, FolderType.CurrentOutfit, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"), |
176 | new TypeMapping(AssetType.Folder, FolderType.Outfit, "application/vnd.ll.outfitfolder", "outfitfolder"), | 176 | new TypeMapping(AssetType.Folder, FolderType.Outfit, "application/vnd.ll.outfitfolder", "outfitfolder"), |
177 | new TypeMapping(AssetType.Folder, FolderType.MyOutfits, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"), | 177 | new TypeMapping(AssetType.Folder, FolderType.MyOutfits, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"), |
178 | 178 | ||
179 | // This next mappping is an asset to inventory item mapping. | 179 | // This next mappping is an asset to inventory item mapping. |
180 | // Note: LL stores folders as assets of type Folder = 8, and it has a corresponding InventoryType = 8 | 180 | // Note: LL stores folders as assets of type Folder = 8, and it has a corresponding InventoryType = 8 |
181 | // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server | 181 | // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server |
182 | new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"), | 182 | new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"), |
183 | 183 | ||
184 | // OpenSim specific | 184 | // OpenSim specific |
@@ -198,7 +198,7 @@ namespace OpenSim.Framework | |||
198 | inventory2Content = new Dictionary<sbyte, string>(); | 198 | inventory2Content = new Dictionary<sbyte, string>(); |
199 | content2Asset = new Dictionary<string, sbyte>(); | 199 | content2Asset = new Dictionary<string, sbyte>(); |
200 | content2Inventory = new Dictionary<string, sbyte>(); | 200 | content2Inventory = new Dictionary<string, sbyte>(); |
201 | 201 | ||
202 | foreach (TypeMapping mapping in MAPPINGS) | 202 | foreach (TypeMapping mapping in MAPPINGS) |
203 | { | 203 | { |
204 | sbyte assetType = mapping.AssetTypeCode; | 204 | sbyte assetType = mapping.AssetTypeCode; |
@@ -226,7 +226,7 @@ namespace OpenSim.Framework | |||
226 | } | 226 | } |
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | public static string SLAssetTypeToContentType(int assetType) | 230 | public static string SLAssetTypeToContentType(int assetType) |
231 | { | 231 | { |
232 | string contentType; | 232 | string contentType; |
@@ -406,7 +406,7 @@ namespace OpenSim.Framework | |||
406 | if(data[0] == "inv_item") | 406 | if(data[0] == "inv_item") |
407 | { | 407 | { |
408 | skipInventoryItem(reader); | 408 | skipInventoryItem(reader); |
409 | } | 409 | } |
410 | else if (line.IndexOf('{') >= 0) | 410 | else if (line.IndexOf('{') >= 0) |
411 | { | 411 | { |
412 | throw new NotANotecardFormatException(reader.LineNumber); | 412 | throw new NotANotecardFormatException(reader.LineNumber); |
@@ -462,7 +462,7 @@ namespace OpenSim.Framework | |||
462 | { | 462 | { |
463 | int length = Int32.Parse(data[2]); | 463 | int length = Int32.Parse(data[2]); |
464 | notecardString = reader.getBlock(length); | 464 | notecardString = reader.getBlock(length); |
465 | } | 465 | } |
466 | else if (line.IndexOf('{') >= 0) | 466 | else if (line.IndexOf('{') >= 0) |
467 | { | 467 | { |
468 | throw new NotANotecardFormatException(reader.LineNumber); | 468 | throw new NotANotecardFormatException(reader.LineNumber); |