Merged

1 files changed, 37 insertions, 37 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 70a61cc..0a81363 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Framework
                 }
             }
         }
-            
+
         /// <summary>
         /// Entries to store media textures on each face
         /// </summary>
@@ -1216,28 +1216,28 @@ namespace OpenSim.Framework
             prim.Properties.Permissions = new Permissions();
             prim.Properties.SalePrice = 10;
             prim.Properties.SaleType = new SaleType();
-            
+
             return prim;
         }
-        
+
         /// <summary>
         /// Encapsulates a list of media entries.
         /// </summary>
-        /// This class is necessary because we want to replace auto-serialization of MediaEntry with something more 
+        /// This class is necessary because we want to replace auto-serialization of MediaEntry with something more
         /// OSD like and less vulnerable to change.
         public class MediaList : List<MediaEntry>, IXmlSerializable
-        {        
+        {
             public const string MEDIA_TEXTURE_TYPE = "sl";
-            
+
             public MediaList() : base() {}
             public MediaList(IEnumerable<MediaEntry> collection) : base(collection) {}
             public MediaList(int capacity) : base(capacity) {}
-            
+
             public XmlSchema GetSchema()
             {
                 return null;
             }
-            
+
             public string ToXml()
             {
                 lock (this)
@@ -1245,78 +1245,78 @@ namespace OpenSim.Framework
                     using (StringWriter sw = new StringWriter())
                     {
                         using (XmlTextWriter xtw = new XmlTextWriter(sw))
-                        {                
+                        {
                             xtw.WriteStartElement("OSMedia");
                             xtw.WriteAttributeString("type", MEDIA_TEXTURE_TYPE);
                             xtw.WriteAttributeString("version", "0.1");
-                            
+
                             OSDArray meArray = new OSDArray();
                             foreach (MediaEntry me in this)
                             {
                                 OSD osd = (null == me ? new OSD() : me.GetOSD());
                                 meArray.Add(osd);
-                            }              
-                            
+                            }
+
                             xtw.WriteStartElement("OSData");
                             xtw.WriteRaw(OSDParser.SerializeLLSDXmlString(meArray));
                             xtw.WriteEndElement();
-                            
+
                             xtw.WriteEndElement();
-                            
-                            xtw.Flush();                          
+
+                            xtw.Flush();
                             return sw.ToString();
                         }
-                    }                                
-                }                
+                    }
+                }
             }
-            
+
             public void WriteXml(XmlWriter writer)
-            {                    
+            {
                 writer.WriteRaw(ToXml());
             }
-                        
+
             public static MediaList FromXml(string rawXml)
             {
                 MediaList ml = new MediaList();
                 ml.ReadXml(rawXml);
                 return ml;
             }
-            
+
             public void ReadXml(string rawXml)
-            {              
+            {
                 using (StringReader sr = new StringReader(rawXml))
                 {
                     using (XmlTextReader xtr = new XmlTextReader(sr))
-                    {             
+                    {
                         xtr.MoveToContent();
-                        
+
                         string type = xtr.GetAttribute("type");
                         //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type);
-                        
+
                         if (type != MEDIA_TEXTURE_TYPE)
-                            return;                        
-                        
-                        xtr.ReadStartElement("OSMedia");    
-                        
+                            return;
+
+                        xtr.ReadStartElement("OSMedia");
+
                         OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
                         foreach (OSD osdMe in osdMeArray)
                         {
                             MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
                             Add(me);
                         }
-                    
-                        xtr.ReadEndElement();                                         
+
+                        xtr.ReadEndElement();
                     }
                 }
-            }              
-    
+            }
+
             public void ReadXml(XmlReader reader)
             {
                 if (reader.IsEmptyElement)
                     return;
-                
+
                 ReadXml(reader.ReadInnerXml());
-            }                        
+            }
         }
-    }        
-}
\ No newline at end of file
+    }
+}