Update svn properties, minor formatting cleanup.

1 files changed, 99 insertions, 99 deletions

diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index 17e71e1..bee3d04 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -1,99 +1,99 @@
-/*

- * 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 OpenSim 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.IO;

-using System.Collections.Generic;

-using NUnit.Framework;

-using NUnit.Framework.SyntaxHelpers;

-using OpenSim.Framework;

-using OpenSim.Data.Tests;

-using OpenSim.Data.MySQL;

-using OpenSim.Region.Framework.Scenes;

-using OpenMetaverse;

-

-namespace OpenSim.Data.MySQL.Tests

-{

-    [TestFixture]

-    public class MySQLEstateTest : BasicEstateTest

-    {

-        public string file;

-        public MySQLManager database;

-        public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";

-        

-        [TestFixtureSetUp]

-        public void Init()

-        {

-            SuperInit();

-            // If we manage to connect to the database with the user

-            // and password above it is our test database, and run

-            // these tests.  If anything goes wrong, ignore these

-            // tests.

-            try 

-            {

-                database = new MySQLManager(connect);

-                regionDb = new MySQLDataStore();

-                regionDb.Initialise(connect);

-                db = new MySQLEstateStore();

-                db.Initialise(connect);

-            } 

-            catch (Exception e)

-            {

-                System.Console.WriteLine("Exception {0}", e);

-                Assert.Ignore();

-            }

-        }

-

-        [TestFixtureTearDown]

-        public void Cleanup()

-        {

-            if (regionDb != null)

-            {

-                regionDb.Dispose();

-            }

-            // if a new table is added, it has to be dropped here

-            if (database != null)

-            {

-                database.ExecuteSql("drop table migrations");

-                database.ExecuteSql("drop table prims");

-                database.ExecuteSql("drop table primshapes");

-                database.ExecuteSql("drop table primitems");

-                database.ExecuteSql("drop table terrain");

-                database.ExecuteSql("drop table land");

-                database.ExecuteSql("drop table landaccesslist");

-                database.ExecuteSql("drop table regionban");

-                database.ExecuteSql("drop table regionsettings");

-                database.ExecuteSql("drop table estate_managers");

-                database.ExecuteSql("drop table estate_groups");

-                database.ExecuteSql("drop table estate_users");

-                database.ExecuteSql("drop table estateban");

-                database.ExecuteSql("drop table estate_settings");

-                database.ExecuteSql("drop table estate_map");

-            }

-        }

-    }

-}

+/*
+ * 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 OpenSim 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.IO;
+using System.Collections.Generic;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenSim.Framework;
+using OpenSim.Data.Tests;
+using OpenSim.Data.MySQL;
+using OpenSim.Region.Framework.Scenes;
+using OpenMetaverse;
+
+namespace OpenSim.Data.MySQL.Tests
+{
+    [TestFixture]
+    public class MySQLEstateTest : BasicEstateTest
+    {
+        public string file;
+        public MySQLManager database;
+        public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
+        
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            SuperInit();
+            // If we manage to connect to the database with the user
+            // and password above it is our test database, and run
+            // these tests.  If anything goes wrong, ignore these
+            // tests.
+            try 
+            {
+                database = new MySQLManager(connect);
+                regionDb = new MySQLDataStore();
+                regionDb.Initialise(connect);
+                db = new MySQLEstateStore();
+                db.Initialise(connect);
+            } 
+            catch (Exception e)
+            {
+                System.Console.WriteLine("Exception {0}", e);
+                Assert.Ignore();
+            }
+        }
+
+        [TestFixtureTearDown]
+        public void Cleanup()
+        {
+            if (regionDb != null)
+            {
+                regionDb.Dispose();
+            }
+            // if a new table is added, it has to be dropped here
+            if (database != null)
+            {
+                database.ExecuteSql("drop table migrations");
+                database.ExecuteSql("drop table prims");
+                database.ExecuteSql("drop table primshapes");
+                database.ExecuteSql("drop table primitems");
+                database.ExecuteSql("drop table terrain");
+                database.ExecuteSql("drop table land");
+                database.ExecuteSql("drop table landaccesslist");
+                database.ExecuteSql("drop table regionban");
+                database.ExecuteSql("drop table regionsettings");
+                database.ExecuteSql("drop table estate_managers");
+                database.ExecuteSql("drop table estate_groups");
+                database.ExecuteSql("drop table estate_users");
+                database.ExecuteSql("drop table estateban");
+                database.ExecuteSql("drop table estate_settings");
+                database.ExecuteSql("drop table estate_map");
+            }
+        }
+    }
+}