From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 OpenSim/Server/Handlers/Asset/AssetServerConnector.cs      | 14 +++++++-------
 OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs     |  4 ++--
 .../Handlers/Asset/Tests/AssetServerPostHandlerTests.cs    | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Server/Handlers/Asset')

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index ab81dd6..bad3ea2 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -151,27 +151,27 @@ namespace OpenSim.Server.Handlers.Asset
                 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
                 return;
             }
-            
+
             AssetBase asset = m_AssetService.Get(assetId.ToString());
             if (asset == null)
-            {                
+            {
                 MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
-                return;                
+                return;
             }
-            
+
             string fileName = rawAssetId;
 
             if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
                 return;
-            
+
             using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
             {
                 using (BinaryWriter bw = new BinaryWriter(fs))
                 {
                     bw.Write(asset.Data);
                 }
-            }   
-            
+            }
+
             MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName);
         }
 
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 91c5c54..8bfc690 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Asset
         public AssetServerGetHandler(IAssetService service) :
                 base("GET", "/assets")
         {
-            m_AssetService = service; 
+            m_AssetService = service;
         }
 
         public AssetServerGetHandler(IAssetService service, IServiceAuth auth, string redirectURL) :
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset
                 httpResponse.ContentType = "text/plain";
                 result = new byte[0];
             }
-            
+
             if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id))
             {
                 httpResponse.StatusCode = (int)HttpStatusCode.Redirect;
diff --git a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs
index faa6fb7..4d2228a 100644
--- a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs
+++ b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs
@@ -52,8 +52,8 @@ namespace OpenSim.Server.Handlers.Asset.Test
 
             UUID assetId = TestHelpers.ParseTail(0x1);
 
-            IConfigSource config = new IniConfigSource();         
-            config.AddConfig("AssetService");           
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("AssetService");
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
             AssetService assetService = new AssetService(config);
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Asset.Test
                 XmlSerializer serializer = new XmlSerializer(typeof(AssetBase));
                 serializer.Serialize(writer, asset);
                 writer.Flush();
-            }            
+            }
 
             buffer.Position = 0;
             asph.Handle(null, buffer, null, null);
@@ -87,13 +87,13 @@ namespace OpenSim.Server.Handlers.Asset.Test
         {
             TestHelpers.InMethod();
 
-            IConfigSource config = new IniConfigSource();         
-            config.AddConfig("AssetService");           
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("AssetService");
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
             AssetService assetService = new AssetService(config);
 
-            AssetServerPostHandler asph = new AssetServerPostHandler(assetService);          
+            AssetServerPostHandler asph = new AssetServerPostHandler(assetService);
 
             MemoryStream buffer = new MemoryStream();
             byte[] badData = new byte[] { 0x48, 0x65, 0x6c, 0x6c, 0x6f };
-- 
cgit v1.1