From b324f88f86eaa540d8da4629f9857a39662869ac Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 17 Aug 2009 02:16:46 +0900 Subject: [PATCH 1/2] Add UUIDs in bin/ScriptEngines to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 18c3dbfcf3..9d2d692cf0 100644 --- a/.gitignore +++ b/.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 From 82c888fc6c103ec345bf656cd469f4260b678bcb Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 17 Aug 2009 10:29:06 +0900 Subject: [PATCH 2/2] Add copyright headers. Formatting cleanup. Fix a compiler warning. --- OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +- OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 2 +- OpenSim/Data/Tests/BasicGridTest.cs | 2 +- .../Data/Tests/PropertyCompareConstraint.cs | 2 +- OpenSim/Data/Tests/PropertyScrambler.cs | 35 ++++++++++++++++--- .../Framework/Scenes/Scene.PacketHandlers.cs | 1 - OpenSim/Tests/Common/TestLogging.cs | 29 ++++++++++++++- 7 files changed, 63 insertions(+), 10 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 849c246b4c..4521a0f3f7 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/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(); diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 557dec792d..e5f7a500ee 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/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"); diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs index a25b736abf..de8fb48c5e 100644 --- a/OpenSim/Data/Tests/BasicGridTest.cs +++ b/OpenSim/Data/Tests/BasicGridTest.cs @@ -46,7 +46,7 @@ namespace OpenSim.Data.Tests { // Clean up all the regions. List regions = db.GetRegionsByName("", 100); - if(regions != null) + if (regions != null) { foreach (RegionProfileData region in regions) { diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs index d64a51e3c9..06ca53ec90 100644 --- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs +++ b/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; diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index c56c10f62a..72aaff1d0a 100644 --- a/OpenSim/Data/Tests/PropertyScrambler.cs +++ b/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) diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 1a7f8f8f16..4fee4c913b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -115,7 +115,6 @@ namespace OpenSim.Region.Framework.Scenes /// public void RequestPrim(uint primLocalID, IClientAPI remoteClient) { - PacketType i = PacketType.ObjectUpdate; List EntityList = GetEntities(); foreach (EntityBase ent in EntityList) diff --git a/OpenSim/Tests/Common/TestLogging.cs b/OpenSim/Tests/Common/TestLogging.cs index d8089c4f98..4a08344321 100644 --- a/OpenSim/Tests/Common/TestLogging.cs +++ b/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;