diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
index 6a7d7875ac..cae864bc7b 100644
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
@@ -1,216 +1,216 @@
-/*
- * 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.Collections.Generic;
-using System.Text;
-using System.Data.SqlClient;
-using System.Data;
-
-namespace OpenSim.Data.MSSQL
-{
- ///
- /// Encapsulates a SqlCommand object but ensures that when it is disposed, its connection is closed and disposed also.
- ///
- internal class AutoClosingSqlCommand : IDbCommand
- {
- private SqlCommand realCommand;
-
- public AutoClosingSqlCommand(SqlCommand cmd)
- {
- realCommand = cmd;
- }
-
- #region IDbCommand Members
-
- public void Cancel()
- {
- realCommand.Cancel();
- }
-
- public string CommandText
- {
- get
- {
- return realCommand.CommandText;
- }
- set
- {
- realCommand.CommandText = value;
- }
- }
-
- public int CommandTimeout
- {
- get
- {
- return realCommand.CommandTimeout;
- }
- set
- {
- realCommand.CommandTimeout = value;
- }
- }
-
- public CommandType CommandType
- {
- get
- {
- return realCommand.CommandType;
- }
- set
- {
- realCommand.CommandType = value;
- }
- }
-
- IDbConnection IDbCommand.Connection
- {
- get
- {
- return realCommand.Connection;
- }
- set
- {
- realCommand.Connection = (SqlConnection) value;
- }
- }
-
- public SqlConnection Connection
- {
- get
- {
- return realCommand.Connection;
- }
- }
-
- IDbDataParameter IDbCommand.CreateParameter()
- {
- return realCommand.CreateParameter();
- }
-
- public SqlParameter CreateParameter()
- {
- return realCommand.CreateParameter();
- }
-
- public int ExecuteNonQuery()
- {
- return realCommand.ExecuteNonQuery();
- }
-
- IDataReader IDbCommand.ExecuteReader(CommandBehavior behavior)
- {
- return realCommand.ExecuteReader(behavior);
- }
-
- public SqlDataReader ExecuteReader(CommandBehavior behavior)
- {
- return realCommand.ExecuteReader(behavior);
- }
-
- IDataReader IDbCommand.ExecuteReader()
- {
- return realCommand.ExecuteReader();
- }
-
- public SqlDataReader ExecuteReader()
- {
- return realCommand.ExecuteReader();
- }
-
- public object ExecuteScalar()
- {
- return realCommand.ExecuteScalar();
- }
-
- IDataParameterCollection IDbCommand.Parameters
- {
- get { return realCommand.Parameters; }
- }
-
- public SqlParameterCollection Parameters
- {
- get { return realCommand.Parameters; }
- }
-
- public void Prepare()
- {
- realCommand.Prepare();
- }
-
- IDbTransaction IDbCommand.Transaction
- {
- get
- {
- return realCommand.Transaction;
- }
- set
- {
- realCommand.Transaction = (SqlTransaction) value;
- }
- }
-
- UpdateRowSource IDbCommand.UpdatedRowSource
- {
- get
- {
- return realCommand.UpdatedRowSource;
- }
- set
- {
- realCommand.UpdatedRowSource = value;
- }
- }
-
- #endregion
-
- #region IDisposable Members
-
- public void Dispose()
- {
- SqlConnection conn = realCommand.Connection;
- try
- {
- realCommand.Dispose();
- }
- finally
- {
- try
- {
- conn.Close();
- }
- finally
- {
- conn.Dispose();
- }
- }
- }
-
- #endregion
- }
-}
+/*
+ * 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.Collections.Generic;
+using System.Text;
+using System.Data.SqlClient;
+using System.Data;
+
+namespace OpenSim.Data.MSSQL
+{
+ ///
+ /// Encapsulates a SqlCommand object but ensures that when it is disposed, its connection is closed and disposed also.
+ ///
+ internal class AutoClosingSqlCommand : IDbCommand
+ {
+ private SqlCommand realCommand;
+
+ public AutoClosingSqlCommand(SqlCommand cmd)
+ {
+ realCommand = cmd;
+ }
+
+ #region IDbCommand Members
+
+ public void Cancel()
+ {
+ realCommand.Cancel();
+ }
+
+ public string CommandText
+ {
+ get
+ {
+ return realCommand.CommandText;
+ }
+ set
+ {
+ realCommand.CommandText = value;
+ }
+ }
+
+ public int CommandTimeout
+ {
+ get
+ {
+ return realCommand.CommandTimeout;
+ }
+ set
+ {
+ realCommand.CommandTimeout = value;
+ }
+ }
+
+ public CommandType CommandType
+ {
+ get
+ {
+ return realCommand.CommandType;
+ }
+ set
+ {
+ realCommand.CommandType = value;
+ }
+ }
+
+ IDbConnection IDbCommand.Connection
+ {
+ get
+ {
+ return realCommand.Connection;
+ }
+ set
+ {
+ realCommand.Connection = (SqlConnection) value;
+ }
+ }
+
+ public SqlConnection Connection
+ {
+ get
+ {
+ return realCommand.Connection;
+ }
+ }
+
+ IDbDataParameter IDbCommand.CreateParameter()
+ {
+ return realCommand.CreateParameter();
+ }
+
+ public SqlParameter CreateParameter()
+ {
+ return realCommand.CreateParameter();
+ }
+
+ public int ExecuteNonQuery()
+ {
+ return realCommand.ExecuteNonQuery();
+ }
+
+ IDataReader IDbCommand.ExecuteReader(CommandBehavior behavior)
+ {
+ return realCommand.ExecuteReader(behavior);
+ }
+
+ public SqlDataReader ExecuteReader(CommandBehavior behavior)
+ {
+ return realCommand.ExecuteReader(behavior);
+ }
+
+ IDataReader IDbCommand.ExecuteReader()
+ {
+ return realCommand.ExecuteReader();
+ }
+
+ public SqlDataReader ExecuteReader()
+ {
+ return realCommand.ExecuteReader();
+ }
+
+ public object ExecuteScalar()
+ {
+ return realCommand.ExecuteScalar();
+ }
+
+ IDataParameterCollection IDbCommand.Parameters
+ {
+ get { return realCommand.Parameters; }
+ }
+
+ public SqlParameterCollection Parameters
+ {
+ get { return realCommand.Parameters; }
+ }
+
+ public void Prepare()
+ {
+ realCommand.Prepare();
+ }
+
+ IDbTransaction IDbCommand.Transaction
+ {
+ get
+ {
+ return realCommand.Transaction;
+ }
+ set
+ {
+ realCommand.Transaction = (SqlTransaction) value;
+ }
+ }
+
+ UpdateRowSource IDbCommand.UpdatedRowSource
+ {
+ get
+ {
+ return realCommand.UpdatedRowSource;
+ }
+ set
+ {
+ realCommand.UpdatedRowSource = value;
+ }
+ }
+
+ #endregion
+
+ #region IDisposable Members
+
+ public void Dispose()
+ {
+ SqlConnection conn = realCommand.Connection;
+ try
+ {
+ realCommand.Dispose();
+ }
+ finally
+ {
+ try
+ {
+ conn.Close();
+ }
+ finally
+ {
+ conn.Dispose();
+ }
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index c0395a9ce5..f8641bc38c 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -59,29 +59,29 @@ namespace OpenSim.Data.MySQL
public void Initialise(string connectionString)
{
- m_connectionString = connectionString;
-
- int passPosition = 0;
- int passEndPosition = 0;
- string displayConnectionString = null;
-
- try
- { // hide the password in the connection string
- passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase);
- passPosition = m_connectionString.IndexOf("=", passPosition);
- if (passPosition < m_connectionString.Length)
- passPosition += 1;
- passEndPosition = m_connectionString.IndexOf(";", passPosition);
-
- displayConnectionString = m_connectionString.Substring(0, passPosition);
- displayConnectionString += "***";
- displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition);
- }
- catch (Exception e)
- {
- m_log.Debug("Exception: password not found in connection string\n" + e.ToString());
- }
-
+ m_connectionString = connectionString;
+
+ int passPosition = 0;
+ int passEndPosition = 0;
+ string displayConnectionString = null;
+
+ try
+ { // hide the password in the connection string
+ passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase);
+ passPosition = m_connectionString.IndexOf("=", passPosition);
+ if (passPosition < m_connectionString.Length)
+ passPosition += 1;
+ passEndPosition = m_connectionString.IndexOf(";", passPosition);
+
+ displayConnectionString = m_connectionString.Substring(0, passPosition);
+ displayConnectionString += "***";
+ displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition);
+ }
+ catch (Exception e)
+ {
+ m_log.Debug("Exception: password not found in connection string\n" + e.ToString());
+ }
+
m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString);
//m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString);
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
index 5631854da8..cadee9348d 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
@@ -1,62 +1,62 @@
-/*
- * 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.Collections.Generic;
-using NUnit.Framework;
-using OpenSim.Tests.Common;
-using OpenSim.Region.ScriptEngine.Common;
-
-namespace OpenSim.Region.ScriptEngine.Common.Tests
-{
- [TestFixture]
- public class LSL_TypesTestVector3
- {
- ///
- /// Tests for Vector3
- ///
- [Test]
-
- public void TestDotProduct()
- {
- // The numbers we test for.
- Dictionary expectsSet = new Dictionary();
- expectsSet.Add("<1, 2, 3> * <2, 3, 4>", 20.0);
- expectsSet.Add("<1, 2, 3> * <0, 0, 0>", 0.0);
-
- double result;
- string[] parts;
- string[] delim = { "*" };
-
- foreach (KeyValuePair ex in expectsSet)
- {
- parts = ex.Key.Split(delim, System.StringSplitOptions.None);
- result = new LSL_Types.Vector3(parts[0]) * new LSL_Types.Vector3(parts[1]);
- Assert.AreEqual(ex.Value, result);
- }
- }
- }
-}
+/*
+ * 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.Collections.Generic;
+using NUnit.Framework;
+using OpenSim.Tests.Common;
+using OpenSim.Region.ScriptEngine.Common;
+
+namespace OpenSim.Region.ScriptEngine.Common.Tests
+{
+ [TestFixture]
+ public class LSL_TypesTestVector3
+ {
+ ///
+ /// Tests for Vector3
+ ///
+ [Test]
+
+ public void TestDotProduct()
+ {
+ // The numbers we test for.
+ Dictionary expectsSet = new Dictionary();
+ expectsSet.Add("<1, 2, 3> * <2, 3, 4>", 20.0);
+ expectsSet.Add("<1, 2, 3> * <0, 0, 0>", 0.0);
+
+ double result;
+ string[] parts;
+ string[] delim = { "*" };
+
+ foreach (KeyValuePair ex in expectsSet)
+ {
+ parts = ex.Key.Split(delim, System.StringSplitOptions.None);
+ result = new LSL_Types.Vector3(parts[0]) * new LSL_Types.Vector3(parts[1]);
+ Assert.AreEqual(ex.Value, result);
+ }
+ }
+ }
+}