Merge branch 'master' of ssh://MyConnection01/var/git/opensim

2 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4feb3fc..c321a15 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// ChatToClientsEvent is triggered via ChatModule (or
         /// substitutes thereof) when a chat message is actually sent to clients.  Clients will only be sent a 
         /// received chat message if they satisfy various conditions (within audible range, etc.)
-        /// </summary>        
+        /// </summary>
         public delegate void ChatToClientsEvent(
             UUID senderID, HashSet<UUID> receiverIDs, 
             string message, ChatTypeEnum type, Vector3 fromPos, string fromName, 
@@ -1636,8 +1636,8 @@ namespace OpenSim.Region.Framework.Scenes
                             e.Message, e.StackTrace);
                     }
                 }
-            }            
-        }        
+            }
+        }
 
         public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat)
         {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 95908fc..e661ca9 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -804,7 +804,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader)
         {
             byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
-            shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);   
+            shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);
         }
 
         private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader)