4 files changed, 177 insertions, 177 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 5c739af..c3f8d2b 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -1,66 +1,66 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using OpenSim.Region.Environment.Scenes;

-using System.Reflection;

-using log4net;

-

-namespace OpenSim.Region.Environment.Modules.World.Archiver

-{

-    /// <summary>

-    /// Handles an individual archive read request

-    /// </summary>

-    public class ArchiveReadRequest

-    {

-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        

-        

-        private Scene m_scene;

-        private string m_loadPath;

-

-        public ArchiveReadRequest(Scene scene, string loadPath)

-        {

-            m_scene = scene;

-            m_loadPath = loadPath;

-

-            DearchiveRegion();

-        }

-        

-        protected void DearchiveRegion()

-        {   

-            TarArchiveReader archive = new TarArchiveReader(m_loadPath);

-            

-            // Just test for now by reading first file

-            string filePath = "ERROR";

-            

-            byte[] data = archive.Read(out filePath);

-            

-            m_log.DebugFormat("[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath);

-            

-            archive.Close();

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenSim.Region.Environment.Scenes;
+using System.Reflection;
+using log4net;
+
+namespace OpenSim.Region.Environment.Modules.World.Archiver
+{
+    /// <summary>
+    /// Handles an individual archive read request
+    /// </summary>
+    public class ArchiveReadRequest
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+        
+        private Scene m_scene;
+        private string m_loadPath;
+
+        public ArchiveReadRequest(Scene scene, string loadPath)
+        {
+            m_scene = scene;
+            m_loadPath = loadPath;
+
+            DearchiveRegion();
+        }
+        
+        protected void DearchiveRegion()
+        {   
+            TarArchiveReader archive = new TarArchiveReader(m_loadPath);
+            
+            // Just test for now by reading first file
+            string filePath = "ERROR";
+            
+            byte[] data = archive.Read(out filePath);
+            
+            m_log.DebugFormat("[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath);
+            
+            archive.Close();
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
index e785c6c..80641e3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -1,108 +1,108 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.IO;

-//using System.Reflection;

-//using log4net;

-

-namespace OpenSim.Region.Environment.Modules.World.Archiver

-{

-    /// <summary>

-    /// Temporary code to do the bare minimum required to read a tar archive for our purposes

-    /// </summary>

-    public class TarArchiveReader

-    {

-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        

-        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();

-        

-        /// <summary>

-        /// Binary reader for the underlying stream

-        /// </summary>

-        protected BinaryReader m_br;

-        

-        public TarArchiveReader(string archivePath)

-        {

-            m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));

-        }

-        

-        public byte[] Read(out string filePath)

-        {

-            TarHeader header = ReadHeader();

-            filePath = header.FilePath;

-            return m_br.ReadBytes(header.FileSize);

-        }

-

-        /// <summary>

-        /// Read the next 512 byte chunk of data as a tar header.

-        /// </summary>

-        /// <returns>A tar header struct</returns>

-        protected TarHeader ReadHeader()

-        {

-            TarHeader tarHeader = new TarHeader();

-            

-            byte[] header = m_br.ReadBytes(512);

-            

-            tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);

-            tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);

-            

-            return tarHeader;

-        }

-        

-        public void Close()

-        {

-            m_br.Close();

-        }

-        

-        /// <summary>

-        /// Convert octal bytes to a decimal representation

-        /// </summary>

-        /// <param name="bytes"></param>

-        /// <returns></returns>

-        public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count)

-        {           

-            string oString = m_asciiEncoding.GetString(bytes, startIndex, count);            

-            

-            int d = 0;

-                        

-            foreach (char c in oString)

-            {

-                d <<= 3;                

-                d |= c - '0';               

-            }

-

-            return d;

-        }        

-    }

-    

-    public struct TarHeader

-    {

-        public string FilePath;

-        public int FileSize;

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.IO;
+//using System.Reflection;
+//using log4net;
+
+namespace OpenSim.Region.Environment.Modules.World.Archiver
+{
+    /// <summary>
+    /// Temporary code to do the bare minimum required to read a tar archive for our purposes
+    /// </summary>
+    public class TarArchiveReader
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        
+        /// <summary>
+        /// Binary reader for the underlying stream
+        /// </summary>
+        protected BinaryReader m_br;
+        
+        public TarArchiveReader(string archivePath)
+        {
+            m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));
+        }
+        
+        public byte[] Read(out string filePath)
+        {
+            TarHeader header = ReadHeader();
+            filePath = header.FilePath;
+            return m_br.ReadBytes(header.FileSize);
+        }
+
+        /// <summary>
+        /// Read the next 512 byte chunk of data as a tar header.
+        /// </summary>
+        /// <returns>A tar header struct</returns>
+        protected TarHeader ReadHeader()
+        {
+            TarHeader tarHeader = new TarHeader();
+            
+            byte[] header = m_br.ReadBytes(512);
+            
+            tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
+            tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);
+            
+            return tarHeader;
+        }
+        
+        public void Close()
+        {
+            m_br.Close();
+        }
+        
+        /// <summary>
+        /// Convert octal bytes to a decimal representation
+        /// </summary>
+        /// <param name="bytes"></param>
+        /// <returns></returns>
+        public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count)
+        {           
+            string oString = m_asciiEncoding.GetString(bytes, startIndex, count);            
+            
+            int d = 0;
+                        
+            foreach (char c in oString)
+            {
+                d <<= 3;                
+                d |= c - '0';               
+            }
+
+            return d;
+        }        
+    }
+    
+    public struct TarHeader
+    {
+        public string FilePath;
+        public int FileSize;
+    }
+}
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 96ae065..ff179da 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -357,7 +357,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
                                 else
                                 {
                                     lsri.OwnerName = "waiting";
-                                    lock(uuidNameLookupList)
+                                    lock (uuidNameLookupList)
                                         uuidNameLookupList.Add(sog.OwnerID);
                                 }
 
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 889be97..e1358db 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules
         private ulong CurrentTime
         {
             get {
-                
+
                 return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000);
             }
         }
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Environment.Modules
             {
                 if (m_rootAgents.ContainsKey(avatar.UUID))
                 {
-                    m_rootAgents[avatar.UUID] = avatar.RegionHandle; 
+                    m_rootAgents[avatar.UUID] = avatar.RegionHandle;
                 }
                 else
                 {