Formatting cleanup, minor refactoring, svn properties.

6 files changed, 94 insertions, 94 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 0c5edaa..6a3b519 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -41,10 +41,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     /// </summary>
     public class ArchiveReadRequest
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
-        
-        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();        
-        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+
         private Scene m_scene;
         private string m_loadPath;
 
@@ -55,22 +55,22 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
             DearchiveRegion();
         }
-        
+
         protected void DearchiveRegion()
-        {   
+        {
             TarArchiveReader archive = new TarArchiveReader(m_loadPath);
-            
+
             string serializedPrims = string.Empty;
-            
+
             // Just test for now by reading first file
             string filePath = "ERROR";
-            
+
             byte[] data;
             while ((data = archive.ReadEntry(out filePath)) != null)
-            {                            
+            {
                 m_log.DebugFormat(
                     "[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath);
-                
+
                 if (filePath.Equals(ArchiveConstants.PRIMS_PATH))
                 {
                     serializedPrims = m_asciiEncoding.GetString(data);
@@ -78,37 +78,37 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 else if (filePath.StartsWith(ArchiveConstants.TEXTURES_PATH))
                 {
                     // Right now we're nastily obtaining the lluuid from the filename
-                    string rawId = filePath.Remove(0, ArchiveConstants.TEXTURES_PATH.Length); 
+                    string rawId = filePath.Remove(0, ArchiveConstants.TEXTURES_PATH.Length);
                     rawId = rawId.Remove(rawId.Length - ArchiveConstants.TEXTURE_EXTENSION.Length);
-                    
+
                     m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", rawId);
-                    
+
                     // Not preserving asset name or description as of yet
                     AssetBase asset = new AssetBase(new LLUUID(rawId), "imported name");
                     asset.Description = "imported description";
-                      
+
                     asset.Type = (sbyte)AssetType.Texture;
                     asset.InvType = (sbyte)InventoryType.Texture;
-                    
+
                     asset.Data = data;
-                                        
-                    m_scene.AssetCache.AddAsset(asset);                    
+
+                    m_scene.AssetCache.AddAsset(asset);
                 }
             }
-            
-            m_log.DebugFormat("[ARCHIVER]: Reached end of archive");                        
-            
+
+            m_log.DebugFormat("[ARCHIVER]: Reached end of archive");
+
             archive.Close();
-            
+
             if (serializedPrims.Equals(string.Empty))
             {
                 m_log.ErrorFormat("[ARCHIVER]: Archive did not contain a {0} file", ArchiveConstants.PRIMS_PATH);
                 return;
             }
-            
+
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading prim data");
-            
+
             IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>();
             serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims));
         }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index 1cc8877..6c341c6 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -80,16 +80,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                     {
                         // XXX: Not a great way to iterate through face textures, but there's no
                         // other way to tell how many faces there actually are
-                        //int i = 0;                        
-                        foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures)                       
-                        {                           
+                        //int i = 0;
+                        foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures)
+                        {
                             if (texture != null)
                             {
-                                //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++);                                
+                                //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++);
                                 textureUuids[texture.TextureID] = 1;
                             }
                         }
-                        
+
                         foreach (TaskInventoryItem tit in part.TaskInventory.Values)
                         {
                             if (tit.Type == (int)InventoryType.Texture)
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             TarArchiveWriter archive = new TarArchiveWriter();
 
             archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
-            
+
             // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
             //archive.AddDir("assets");
 
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 if (assets[uuid] != null)
                 {
                     archive.AddFile(
-                        ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, 
+                        ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
                         assets[uuid].Data);
                 }
                 else
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             }
 
             archive.WriteTar(m_savePath);
-            
+
             m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
         }
 
@@ -232,11 +232,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 newThread.Start();
             }
         }
-        
+
         /// <summary>
         /// Perform the callback on the original requester of the assets
         /// </summary>
-        protected void PerformAssetsRequestCallback()        
+        protected void PerformAssetsRequestCallback()
         {
             m_assetsRequestCallback(m_assets);
         }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
index b199d5f..463e172 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -39,24 +39,24 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     public class TarArchiveReader
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();        
-        
+
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
+
         /// <summary>
         /// Binary reader for the underlying stream
         /// </summary>
         protected BinaryReader m_br;
-        
+
         /// <summary>
         /// Used to trim off null chars
         /// </summary>
         protected char[] m_nullCharArray = new char[] { '\0' };
-        
+
         public TarArchiveReader(string archivePath)
         {
             m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));
         }
-        
+
         /// <summary>
         /// Are we at the end of the archive?
         /// </summary>
@@ -64,13 +64,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         public bool AtEof()
         {
             // If we've reached the end of the archive we'll be in null block territory, which means
-            // the next byte will be 0            
+            // the next byte will be 0
             if (m_br.PeekChar() == 0)
                 return true;
-            
+
             return false;
         }
-        
+
         /// <summary>
         /// Read the next entry in the tar file.
         /// </summary>
@@ -79,27 +79,27 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         public byte[] ReadEntry(out string filePath)
         {
             filePath = String.Empty;
-            
+
             if (AtEof())
                 return null;
-            
-            TarHeader header = ReadHeader();    
-                        
+
+            TarHeader header = ReadHeader();
+
             filePath = header.FilePath;
             byte[] data = m_br.ReadBytes(header.FileSize);
-            
-            m_log.DebugFormat("[TAR ARCHIVE READER]: filePath {0}, fileSize {1}", filePath, header.FileSize);                                    
-            
-            // Read the rest of the empty padding in the 512 byte block 
+
+            m_log.DebugFormat("[TAR ARCHIVE READER]: filePath {0}, fileSize {1}", filePath, header.FileSize);
+
+            // Read the rest of the empty padding in the 512 byte block
             if (header.FileSize % 512 != 0)
             {
                 int paddingLeft = 512 - (header.FileSize % 512);
-                
+
                 m_log.DebugFormat("[TAR ARCHIVE READER]: Reading {0} padding bytes", paddingLeft);
 
                 m_br.ReadBytes(paddingLeft);
-            }          
-            
+            }
+
             return data;
         }
 
@@ -109,44 +109,44 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// </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.FilePath = tarHeader.FilePath.Trim(m_nullCharArray);
             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);            
-            
+        {
+            string oString = m_asciiEncoding.GetString(bytes, startIndex, count);
+
             int d = 0;
-                        
+
             foreach (char c in oString)
             {
-                d <<= 3;                
-                d |= c - '0';               
+                d <<= 3;
+                d |= c - '0';
             }
 
             return d;
-        }        
+        }
     }
-    
+
     public struct TarHeader
     {
         public string FilePath;
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
index b7ed9f9..e0d2add 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
@@ -34,30 +34,30 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
     public interface IRegionSerialiser
     {
-        List<string> SerialiseRegion(Scene scene, string saveDir);        
-            
+        List<string> SerialiseRegion(Scene scene, string saveDir);
+
         void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset);
-        
+
         void SavePrimsToXml(Scene scene, string fileName);
 
         /// <summary>
         /// Load prims from the xml2 format
         /// </summary>
         /// <param name="scene"></param>
-        /// <param name="fileName"></param>        
+        /// <param name="fileName"></param>
         void LoadPrimsFromXml2(Scene scene, string fileName);
-        
+
         /// <summary>
         /// Load prims from the xml2 format
         /// </summary>
         /// <param name="scene"></param>
-        /// <param name="reader"></param>        
+        /// <param name="reader"></param>
         void LoadPrimsFromXml2(Scene scene, TextReader reader);
-        
+
         void SavePrimsToXml2(Scene scene, string fileName);
-            
+
         void LoadGroupFromXml2String(Scene scene, string xmlString);
-        
+
         string SavePrimGroupToXML2String(SceneObjectGroup grp);
     }
 }
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 2ac0754..5ec8026 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -56,14 +56,14 @@ namespace OpenSim.Region.Environment.Scenes
                 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
                 {
                     SceneObjectGroup obj = new SceneObjectGroup(scene, scene.RegionInfo.RegionHandle, aPrimNode.OuterXml);
-                    
+
                     if (newIDS)
                     {
                         obj.ResetIDs();
                     }
                     //if we want this to be a import method then we need new uuids for the object to avoid any clashes
                     //obj.RegenerateFullIDs();
-                    
+
                     scene.AddSceneObject(obj);
 
                     SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             LoadPrimsFromXml2(scene, new XmlTextReader(fileName));
         }
-        
+
         /// <summary>
         /// Load prims from the xml2 format
         /// </summary>
@@ -173,24 +173,24 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="scene"></param>
         /// <param name="reader"></param>
         protected static void LoadPrimsFromXml2(Scene scene, XmlTextReader reader)
-        {            
-            XmlDocument doc = new XmlDocument();                        
+        {
+            XmlDocument doc = new XmlDocument();
             reader.WhitespaceHandling = WhitespaceHandling.None;
             doc.Load(reader);
             reader.Close();
             XmlNode rootNode = doc.FirstChild;
-            
+
             foreach (XmlNode aPrimNode in rootNode.ChildNodes)
             {
                 CreatePrimFromXml(scene, aPrimNode.OuterXml);
-            }            
+            }
         }
 
         public static void CreatePrimFromXml(Scene scene, string xmlData)
         {
             SceneObjectGroup obj = new SceneObjectGroup(xmlData);
             LLVector3 receivedVelocity = obj.RootPart.Velocity;
-            //System.Console.WriteLine(obj.RootPart.Velocity.ToString());            
+            //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
             scene.AddSceneObjectFromStorage(obj);
 
             SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index b181fe8..c7c8e39 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -86,42 +86,42 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
         #endregion
 
         #region IRegionSerialiser Members
-            
+
         public void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset)
         {
             SceneXmlLoader.LoadPrimsFromXml(scene, fileName, newIDS, loadOffset);
         }
-        
+
         public void SavePrimsToXml(Scene scene, string fileName)
         {
             SceneXmlLoader.SavePrimsToXml(scene, fileName);
         }
-        
+
         public void LoadPrimsFromXml2(Scene scene, string fileName)
         {
             SceneXmlLoader.LoadPrimsFromXml2(scene, fileName);
         }
-                
+
         public void LoadPrimsFromXml2(Scene scene, TextReader reader)
         {
             SceneXmlLoader.LoadPrimsFromXml2(scene, reader);
-        }        
-        
+        }
+
         public void SavePrimsToXml2(Scene scene, string fileName)
         {
             SceneXmlLoader.SavePrimsToXml2(scene, fileName);
         }
-            
+
         public void LoadGroupFromXml2String(Scene scene, string xmlString)
         {
             SceneXmlLoader.LoadGroupFromXml2String(scene, xmlString);
         }
-        
+
         public string SavePrimGroupToXML2String(SceneObjectGroup grp)
         {
             return SceneXmlLoader.SavePrimGroupToXML2String(grp);
         }
-        
+
         public List<string> SerialiseRegion(Scene scene, string saveDir)
         {
             List<string> results = new List<string>();