Update svn properties, add copyright headers, minor formatting cleanup.

OpenSim/Data/NHibernate/EstateRegionLink.cs

@@ -1,3 +1,30 @@
+/*
+ * 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 OpenSimulator 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.Collections.Generic;
 using System.Text;

OpenSim/Data/Tests/DataTestUtil.cs

@@ -1,4 +1,31 @@
-using System;
+/*
+ * 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 OpenSimulator 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.Collections.Generic;
 using System.Text;
 using OpenMetaverse;
@@ -6,13 +33,11 @@ using NUnit.Framework;
 
 namespace OpenSim.Data.Tests
 {
-
     /// <summary>
     /// Shared constants and methods for database unit tests.
     /// </summary>
     public class DataTestUtil
     {
-
         public const uint UNSIGNED_INTEGER_MIN = uint.MinValue;
         public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue / 2; // NHibernate does not support unsigned integer range.
 
@@ -57,6 +82,6 @@ namespace OpenSim.Data.Tests
             Assert.GreaterOrEqual(actualValue, expectedValue - Math.Abs(expectedValue) * DOUBLE_PRECISSION);
             Assert.LessOrEqual(actualValue, expectedValue + Math.Abs(expectedValue) * DOUBLE_PRECISSION);
         }
-
     }
 }
+

OpenSim/Region/Application/OpenSimBase.cs

@@ -437,7 +437,7 @@ namespace OpenSim
         private IAssetServer loadAssetServer(string id, PluginInitialiserBase pi)
         {
 
-            if(id != null && id != String.Empty)
+            if (id != null && id != String.Empty)
             {
                 m_log.DebugFormat("[OPENSIMBASE] Attempting to load asset server id={0}", id);
 

OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs

@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             int width = 256;
             int height = 256;
             int alpha = 255; // 0 is transparent
-			Color bgColour = Color.White;  // Default background color
+            Color bgColour = Color.White;  // Default background color
             
             char[] paramDelimiter = { ',' };
             char[] nvpDelimiter = { ':' };
@@ -230,18 +230,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                               }
                           }
                           break;
-					 case "bgcolour":
+                     case "bgcolour":
-						 int hex = 0;
+                         int hex = 0;
-		                 if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
+                         if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
-		                 {
+                         {
-		                     bgColour = Color.FromArgb(hex);
+                             bgColour = Color.FromArgb(hex);
-		                 } 
+                         } 
-		                 else
+                         else
-		                 {
+                         {
-		                     
+                             bgColour = Color.FromName(value);
-		                     bgColour = Color.FromName(value);
+                         }
-		                 }
+                         break;    
-					     break;	
                      case "":
                          // blank string has been passed do nothing just use defaults
                      break;
@@ -271,7 +270,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                          }
                      break;   
                 }
-            
             }
             
             Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
@@ -282,8 +280,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             // background color in their scripts, only do when fully opaque
             if (alpha == 255)
             {
-				graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height); 
+                graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height); 
-             
             }
 
             for (int w = 0; w < bitmap.Width; w++)
@@ -294,7 +291,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 }
             }
 
-
             GDIDraw(data, graph);
 
             byte[] imageJ2000 = new byte[0];
@@ -326,10 +322,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             }
             
             return parsed;
-            
         }
 
-
 /*
         private void CairoDraw(string data, System.Drawing.Graphics graph)
         {
@@ -462,38 +456,38 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                     fontSize = Convert.ToSingle(nextLine, CultureInfo.InvariantCulture);
                     myFont = new Font(fontName, fontSize);
                 }
-				else if (nextLine.StartsWith("FontProp"))
+                else if (nextLine.StartsWith("FontProp"))
-				{
+                {
-					nextLine = nextLine.Remove(0, 8);
+                    nextLine = nextLine.Remove(0, 8);
                     nextLine = nextLine.Trim();
 
-					string [] fprops = nextLine.Split(partsDelimiter);
+                    string [] fprops = nextLine.Split(partsDelimiter);
-					foreach (string prop in  fprops) {
+                    foreach (string prop in  fprops) {
                         
-						switch (prop)
+                        switch (prop)
-						{
+                        {
-							case "B":
+                            case "B":
-							    if(!(myFont.Bold))
+                                if (!(myFont.Bold))
-								    myFont = new Font(myFont, myFont.Style | FontStyle.Bold);
+                                    myFont = new Font(myFont, myFont.Style | FontStyle.Bold);
-							break;
+                            break;
-							case "I":
+                            case "I":
-							    if(!(myFont.Italic))
+                                if (!(myFont.Italic))
-								    myFont = new Font(myFont, myFont.Style | FontStyle.Italic);
+                                    myFont = new Font(myFont, myFont.Style | FontStyle.Italic);
-							break;
+                            break;
-							case "U":
+                            case "U":
-							    if(!(myFont.Underline))
+                                if (!(myFont.Underline))
-								    myFont = new Font(myFont, myFont.Style | FontStyle.Underline);
+                                    myFont = new Font(myFont, myFont.Style | FontStyle.Underline);
-							break;
+                            break;
-						    case "S":
+                            case "S":
-							    if(!(myFont.Strikeout))
+                                if (!(myFont.Strikeout))
-								    myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout);
+                                    myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout);
-							break;
+                            break;
-						    case "R":
+                            case "R":
-								myFont = new Font(myFont, FontStyle.Regular);
+                                myFont = new Font(myFont, FontStyle.Regular);
-							break;
+                            break;
-						}
+                        }
-					}
+                    }
-				}
+                }
                 else if (nextLine.StartsWith("FontName"))
                 {
                     nextLine = nextLine.Remove(0, 8);

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -1379,7 +1379,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (part != null)
             {
-				
                 TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
                 bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
                                            & (uint)PrimFlags.AllowInventoryDrop) != 0;

OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs

@@ -282,7 +282,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
             {
                 m_log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName);
                 RemoveFromAttendeeList(client.AgentId, client.Name, client.Scene);
-                lock(m_sceneAttendees)
+                lock (m_sceneAttendees)
                 {
                     AnnounceToAgentsRegion(client.Scene, String.Format(m_announceLeaving, client.Name, client.Scene.RegionInfo.RegionName,
                                                                        m_sceneAttendees[client.Scene].Count));
@@ -406,7 +406,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                                           attendees.Count, scene.RegionInfo.RegionName, 
                                           scene.RegionInfo.RegionID, 
                                           DateTime.UtcNow.ToString("s")));
-                lock(m_sceneAttendees)
+                lock (m_sceneAttendees)
                 {
                     foreach (UUID uuid in attendees)
                     {
@@ -458,7 +458,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                 string payload = bs.Payload;
                 HttpWebRequest updatePost = bs.Poster;
 
-                using(StreamWriter payloadStream = new StreamWriter(updatePost.EndGetRequestStream(result)))
+                using (StreamWriter payloadStream = new StreamWriter(updatePost.EndGetRequestStream(result)))
                 {
                     payloadStream.Write(payload);
                     payloadStream.Close();