Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

.gitignore

@@ -21,6 +21,7 @@ bin/*.db
 bin/addin-db-*
 bin/*.dll
 bin/OpenSim.vshost.exe.config
+bin/ScriptEngines/*-*-*-*-*
 bin/ScriptEngines/*.dll
 bin/ScriptEngines/*/*.dll
 bin/ScriptEngines/*/*.state

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -439,7 +439,7 @@ namespace OpenSim.Data.MySQL
                     MySqlDataReader reader = result.ExecuteReader();
 
                     InventoryFolderBase folder = null;
-                    if(reader.Read())
+                    if (reader.Read())
                          folder = readInventoryFolder(reader);
                     reader.Close();
                     result.Dispose();

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -301,7 +301,7 @@ namespace OpenSim.Data.SQLite
                 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
 
                 inventoryRow = inventoryFolderTable.Rows.Find(item.Folder.ToString());
-                if(inventoryRow != null) //MySQL doesn't throw an exception here, so sqlite shouldn't either.
+                if (inventoryRow != null) //MySQL doesn't throw an exception here, so sqlite shouldn't either.
                     inventoryRow["version"] = (int)inventoryRow["version"] + 1;
 
                 invFoldersDa.Update(ds, "inventoryfolders");

OpenSim/Data/Tests/BasicGridTest.cs

@@ -46,7 +46,7 @@ namespace OpenSim.Data.Tests
         {
             // Clean up all the regions.
             List<RegionProfileData> regions = db.GetRegionsByName("", 100);
-            if(regions != null)
+            if (regions != null)
             {
                 foreach (RegionProfileData region in regions)
                 {

OpenSim/Data/Tests/PropertyCompareConstraint.cs

@@ -83,7 +83,7 @@ namespace OpenSim.Data.Tests
             }
 
             //prevent loops...
-            if(propertyNames.Count > 50)
+            if (propertyNames.Count > 50)
             {
                 failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
                 failingActual = actual;

OpenSim/Data/Tests/PropertyScrambler.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;
 using System.Collections.Generic;
@@ -20,7 +47,7 @@ namespace OpenSim.Data.Tests
         private void AddExpressionToNotScrableList(Expression expression)
         {
             UnaryExpression unaryExpression = expression as UnaryExpression;
-            if(unaryExpression != null)
+            if (unaryExpression != null)
             {
                 AddExpressionToNotScrableList(unaryExpression.Operand);
                 return;
@@ -58,7 +85,7 @@ namespace OpenSim.Data.Tests
             {
                 //Skip indexers of classes.  We will assume that everything that has an indexer
                 //  is also IEnumberable.  May not always be true, but should be true normally.
-                if(property.GetIndexParameters().Length > 0)
+                if (property.GetIndexParameters().Length > 0)
                     continue;
 
                 RandomizeProperty(obj, property, null);
@@ -66,7 +93,7 @@ namespace OpenSim.Data.Tests
             //Now if it implments IEnumberable, it's probably some kind of list, so we should randomize
             //  everything inside of it.
             IEnumerable enumerable = obj as IEnumerable;
-            if(enumerable != null)
+            if (enumerable != null)
             {
                 foreach (object value in enumerable)
                 {
@@ -78,7 +105,7 @@ namespace OpenSim.Data.Tests
         private readonly Random random = new Random();
         private void RandomizeProperty(object obj, PropertyInfo property, object[] index)
         {//I'd like a better way to compare, but I had lots of problems with InventoryFolderBase because the ID is inherited.
-            if(membersToNotScramble.Contains(property.Name))
+            if (membersToNotScramble.Contains(property.Name))
                 return;
             Type t = property.PropertyType;
             if (!property.CanWrite)

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

@@ -115,7 +115,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void RequestPrim(uint primLocalID, IClientAPI remoteClient)
         {
-            PacketType i = PacketType.ObjectUpdate;
             List<EntityBase> EntityList = GetEntities();
 
             foreach (EntityBase ent in EntityList)

OpenSim/Tests/Common/TestLogging.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 log4net.Appender;