changed to native line ending encoding

6 files changed, 1596 insertions, 1596 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index ef643d2..09f5e83 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -1,287 +1,287 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.Data;

-using System.Security.Cryptography;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Data.MySQL

-{

-    /// <summary>

-    /// A MySQL Interface for the Grid Server

-    /// </summary>

-    public class MySQLGridData : IGridData

-    {

-        /// <summary>

-        /// MySQL Database Manager

-        /// </summary>

-        private MySQLManager database;

-

-        /// <summary>

-        /// Initialises the Grid Interface

-        /// </summary>

-        public void Initialise()

-        {

-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");

-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");

-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");

-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");

-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");

-

-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);

-        }

-

-        /// <summary>

-        /// Shuts down the grid interface

-        /// </summary>

-        public void Close()

-        {

-            database.Close();

-        }

-

-        /// <summary>

-        /// Returns the plugin name

-        /// </summary>

-        /// <returns>Plugin name</returns>

-        public string getName()

-        {

-            return "MySql OpenGridData";

-        }

-

-        /// <summary>

-        /// Returns the plugin version

-        /// </summary>

-        /// <returns>Plugin version</returns>

-        public string getVersion()

-        {

-            return "0.1";

-        }

-

-        /// <summary>

-        /// Returns all the specified region profiles within coordates -- coordinates are inclusive

-        /// </summary>

-        /// <param name="xmin">Minimum X coordinate</param>

-        /// <param name="ymin">Minimum Y coordinate</param>

-        /// <param name="xmax">Maximum X coordinate</param>

-        /// <param name="ymax">Maximum Y coordinate</param>

-        /// <returns></returns>

-        public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?xmin"] = xmin.ToString();

-                    param["?ymin"] = ymin.ToString();

-                    param["?xmax"] = xmax.ToString();

-                    param["?ymax"] = ymax.ToString();

-

-                    IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    SimProfileData row;

-

-                    List<SimProfileData> rows = new List<SimProfileData>();

-

-                    while ((row = database.readSimRow(reader)) != null)

-                    {

-                        rows.Add(row);

-                    }

-                    reader.Close();

-                    result.Dispose();

-

-                    return rows.ToArray();

-

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a sim profile from it's location

-        /// </summary>

-        /// <param name="handle">Region location handle</param>

-        /// <returns>Sim profile</returns>

-        public SimProfileData GetProfileByHandle(ulong handle)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?handle"] = handle.ToString();

-

-                    IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    SimProfileData row = database.readSimRow(reader);

-                    reader.Close();

-                    result.Dispose();

-

-                    return row;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a sim profile from it's UUID

-        /// </summary>

-        /// <param name="uuid">The region UUID</param>

-        /// <returns>The sim profile</returns>

-        public SimProfileData GetProfileByLLUUID(LLUUID uuid)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = uuid.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    SimProfileData row = database.readSimRow(reader);

-                    reader.Close();

-                    result.Dispose();

-

-                    return row;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Adds a new profile to the database

-        /// </summary>

-        /// <param name="profile">The profile to add</param>

-        /// <returns>Successful?</returns>

-        public DataResponse AddProfile(SimProfileData profile)

-        {

-            lock (database)

-            {

-                if (database.insertRegion(profile))

-                {

-                    return DataResponse.RESPONSE_OK;

-                }

-                else

-                {

-                    return DataResponse.RESPONSE_ERROR;

-                }

-            }

-        }

-

-        /// <summary>

-        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.

-        /// </summary>

-        /// <param name="uuid">The UUID of the challenger</param>

-        /// <param name="handle">The attempted regionHandle of the challenger</param>

-        /// <param name="authkey">The secret</param>

-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>

-        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)

-        {

-            bool throwHissyFit = false; // Should be true by 1.0

-

-            if (throwHissyFit)

-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");

-

-            SimProfileData data = GetProfileByLLUUID(uuid);

-

-            return (handle == data.regionHandle && authkey == data.regionSecret);

-        }

-

-        /// <summary>

-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region

-        /// </summary>

-        /// <remarks>This requires a security audit.</remarks>

-        /// <param name="uuid"></param>

-        /// <param name="handle"></param>

-        /// <param name="authhash"></param>

-        /// <param name="challenge"></param>

-        /// <returns></returns>

-        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)

-        {

-            SHA512Managed HashProvider = new SHA512Managed();

-            ASCIIEncoding TextProvider = new ASCIIEncoding();

-

-            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);

-            byte[] hash = HashProvider.ComputeHash(stream);

-

-            return false;

-        }

-

-        public ReservationData GetReservationAtPoint(uint x, uint y)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?x"] = x.ToString();

-                    param["?y"] = y.ToString();

-                    IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    ReservationData row = database.readReservationRow(reader);

-                    reader.Close();

-                    result.Dispose();

-

-                    return row;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-    }

-

-

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Data;
+using System.Security.Cryptography;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Grid Server
+    /// </summary>
+    public class MySQLGridData : IGridData
+    {
+        /// <summary>
+        /// MySQL Database Manager
+        /// </summary>
+        private MySQLManager database;
+
+        /// <summary>
+        /// Initialises the Grid Interface
+        /// </summary>
+        public void Initialise()
+        {
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+
+        /// <summary>
+        /// Shuts down the grid interface
+        /// </summary>
+        public void Close()
+        {
+            database.Close();
+        }
+
+        /// <summary>
+        /// Returns the plugin name
+        /// </summary>
+        /// <returns>Plugin name</returns>
+        public string getName()
+        {
+            return "MySql OpenGridData";
+        }
+
+        /// <summary>
+        /// Returns the plugin version
+        /// </summary>
+        /// <returns>Plugin version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        /// <summary>
+        /// Returns all the specified region profiles within coordates -- coordinates are inclusive
+        /// </summary>
+        /// <param name="xmin">Minimum X coordinate</param>
+        /// <param name="ymin">Minimum Y coordinate</param>
+        /// <param name="xmax">Maximum X coordinate</param>
+        /// <param name="ymax">Maximum Y coordinate</param>
+        /// <returns></returns>
+        public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?xmin"] = xmin.ToString();
+                    param["?ymin"] = ymin.ToString();
+                    param["?xmax"] = xmax.ToString();
+                    param["?ymax"] = ymax.ToString();
+
+                    IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row;
+
+                    List<SimProfileData> rows = new List<SimProfileData>();
+
+                    while ((row = database.readSimRow(reader)) != null)
+                    {
+                        rows.Add(row);
+                    }
+                    reader.Close();
+                    result.Dispose();
+
+                    return rows.ToArray();
+
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's location
+        /// </summary>
+        /// <param name="handle">Region location handle</param>
+        /// <returns>Sim profile</returns>
+        public SimProfileData GetProfileByHandle(ulong handle)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?handle"] = handle.ToString();
+
+                    IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row = database.readSimRow(reader);
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's UUID
+        /// </summary>
+        /// <param name="uuid">The region UUID</param>
+        /// <returns>The sim profile</returns>
+        public SimProfileData GetProfileByLLUUID(LLUUID uuid)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = uuid.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row = database.readSimRow(reader);
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Adds a new profile to the database
+        /// </summary>
+        /// <param name="profile">The profile to add</param>
+        /// <returns>Successful?</returns>
+        public DataResponse AddProfile(SimProfileData profile)
+        {
+            lock (database)
+            {
+                if (database.insertRegion(profile))
+                {
+                    return DataResponse.RESPONSE_OK;
+                }
+                else
+                {
+                    return DataResponse.RESPONSE_ERROR;
+                }
+            }
+        }
+
+        /// <summary>
+        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
+        /// </summary>
+        /// <param name="uuid">The UUID of the challenger</param>
+        /// <param name="handle">The attempted regionHandle of the challenger</param>
+        /// <param name="authkey">The secret</param>
+        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
+        {
+            bool throwHissyFit = false; // Should be true by 1.0
+
+            if (throwHissyFit)
+                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
+
+            SimProfileData data = GetProfileByLLUUID(uuid);
+
+            return (handle == data.regionHandle && authkey == data.regionSecret);
+        }
+
+        /// <summary>
+        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
+        /// </summary>
+        /// <remarks>This requires a security audit.</remarks>
+        /// <param name="uuid"></param>
+        /// <param name="handle"></param>
+        /// <param name="authhash"></param>
+        /// <param name="challenge"></param>
+        /// <returns></returns>
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
+        {
+            SHA512Managed HashProvider = new SHA512Managed();
+            ASCIIEncoding TextProvider = new ASCIIEncoding();
+
+            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
+            byte[] hash = HashProvider.ComputeHash(stream);
+
+            return false;
+        }
+
+        public ReservationData GetReservationAtPoint(uint x, uint y)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?x"] = x.ToString();
+                    param["?y"] = y.ToString();
+                    IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    ReservationData row = database.readReservationRow(reader);
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+    }
+
+
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 790759a..d32db1b 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -1,309 +1,309 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.Data;

-using libsecondlife;

-

-namespace OpenSim.Framework.Data.MySQL

-{

-    /// <summary>

-    /// A MySQL interface for the inventory server

-    /// </summary>

-    class MySQLInventoryData : IInventoryData

-    {

-        /// <summary>

-        /// The database manager

-        /// </summary>

-        public MySQLManager database;

-

-        /// <summary>

-        /// Loads and initialises this database plugin

-        /// </summary>

-        public void Initialise()

-        {

-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");

-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");

-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");

-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");

-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");

-

-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);

-        }

-        

-        /// <summary>

-        /// The name of this DB provider

-        /// </summary>

-        /// <returns>Name of DB provider</returns>

-        public string getName()

-        {

-            return "MySQL Inventory Data Interface";

-        }

-

-        /// <summary>

-        /// Closes this DB provider

-        /// </summary>

-        public void Close()

-        {

-            // Do nothing.

-        }

-

-        /// <summary>

-        /// Returns the version of this DB provider

-        /// </summary>

-        /// <returns>A string containing the DB provider</returns>

-        public string getVersion()

-        {

-            return "0.1";

-        }

-

-        /// <summary>

-        /// Returns a list of items in a specified folder

-        /// </summary>

-        /// <param name="folderID">The folder to search</param>

-        /// <returns>A list containing inventory items</returns>

-        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = folderID.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    List<InventoryItemBase> items = database.readInventoryItems(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    return items;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a list of the root folders within a users inventory

-        /// </summary>

-        /// <param name="user">The user whos inventory is to be searched</param>

-        /// <returns>A list of folder objects</returns>

-        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = user.ToStringHyphenated();

-                    param["?zero"] = LLUUID.Zero.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    return items;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a list of folders in a users inventory contained within the specified folder

-        /// </summary>

-        /// <param name="parentID">The folder to search</param>

-        /// <returns>A list of inventory folders</returns>

-        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = parentID.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    return items;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a specified inventory item

-        /// </summary>

-        /// <param name="item">The item to return</param>

-        /// <returns>An inventory item</returns>

-        public InventoryItemBase getInventoryItem(LLUUID item)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = item.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    List<InventoryItemBase> items = database.readInventoryItems(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    if (items.Count > 0)

-                    {

-                        return items[0];

-                    }

-                    else

-                    {

-                        return null;

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a specified inventory folder

-        /// </summary>

-        /// <param name="folder">The folder to return</param>

-        /// <returns>A folder class</returns>

-        public InventoryFolderBase getInventoryFolder(LLUUID folder)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = folder.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    if (items.Count > 0)

-                    {

-                        return items[0];

-                    }

-                    else

-                    {

-                        return null;

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Adds a specified item to the database

-        /// </summary>

-        /// <param name="item">The inventory item</param>

-        public void addInventoryItem(InventoryItemBase item)

-        {

-            lock (database)

-            {

-                database.insertItem(item);

-            }

-        }

-

-        /// <summary>

-        /// Updates the specified inventory item

-        /// </summary>

-        /// <param name="item">Inventory item to update</param>

-        public void updateInventoryItem(InventoryItemBase item)

-        {

-            addInventoryItem(item);

-        }

-

-        /// <summary>

-        /// Creates a new inventory folder

-        /// </summary>

-        /// <param name="folder">Folder to create</param>

-        public void addInventoryFolder(InventoryFolderBase folder)

-        {

-            lock (database)

-            {

-                database.insertFolder(folder);

-            }

-        }

-

-        /// <summary>

-        /// Updates an inventory folder

-        /// </summary>

-        /// <param name="folder">Folder to update</param>

-        public void updateInventoryFolder(InventoryFolderBase folder)

-        {

-            addInventoryFolder(folder);

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Data;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL interface for the inventory server
+    /// </summary>
+    class MySQLInventoryData : IInventoryData
+    {
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        public MySQLManager database;
+
+        /// <summary>
+        /// Loads and initialises this database plugin
+        /// </summary>
+        public void Initialise()
+        {
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+        
+        /// <summary>
+        /// The name of this DB provider
+        /// </summary>
+        /// <returns>Name of DB provider</returns>
+        public string getName()
+        {
+            return "MySQL Inventory Data Interface";
+        }
+
+        /// <summary>
+        /// Closes this DB provider
+        /// </summary>
+        public void Close()
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        /// <summary>
+        /// Returns a list of items in a specified folder
+        /// </summary>
+        /// <param name="folderID">The folder to search</param>
+        /// <returns>A list containing inventory items</returns>
+        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = folderID.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryItemBase> items = database.readInventoryItems(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return items;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a list of the root folders within a users inventory
+        /// </summary>
+        /// <param name="user">The user whos inventory is to be searched</param>
+        /// <returns>A list of folder objects</returns>
+        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = user.ToStringHyphenated();
+                    param["?zero"] = LLUUID.Zero.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return items;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a list of folders in a users inventory contained within the specified folder
+        /// </summary>
+        /// <param name="parentID">The folder to search</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = parentID.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return items;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a specified inventory item
+        /// </summary>
+        /// <param name="item">The item to return</param>
+        /// <returns>An inventory item</returns>
+        public InventoryItemBase getInventoryItem(LLUUID item)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = item.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryItemBase> items = database.readInventoryItems(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    if (items.Count > 0)
+                    {
+                        return items[0];
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a specified inventory folder
+        /// </summary>
+        /// <param name="folder">The folder to return</param>
+        /// <returns>A folder class</returns>
+        public InventoryFolderBase getInventoryFolder(LLUUID folder)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = folder.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    if (items.Count > 0)
+                    {
+                        return items[0];
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Adds a specified item to the database
+        /// </summary>
+        /// <param name="item">The inventory item</param>
+        public void addInventoryItem(InventoryItemBase item)
+        {
+            lock (database)
+            {
+                database.insertItem(item);
+            }
+        }
+
+        /// <summary>
+        /// Updates the specified inventory item
+        /// </summary>
+        /// <param name="item">Inventory item to update</param>
+        public void updateInventoryItem(InventoryItemBase item)
+        {
+            addInventoryItem(item);
+        }
+
+        /// <summary>
+        /// Creates a new inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to create</param>
+        public void addInventoryFolder(InventoryFolderBase folder)
+        {
+            lock (database)
+            {
+                database.insertFolder(folder);
+            }
+        }
+
+        /// <summary>
+        /// Updates an inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to update</param>
+        public void updateInventoryFolder(InventoryFolderBase folder)
+        {
+            addInventoryFolder(folder);
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 38f9fd3..2ba9c3d 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -1,105 +1,105 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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;

-

-namespace OpenSim.Framework.Data.MySQL

-{

-    /// <summary>

-    /// An interface to the log database for MySQL

-    /// </summary>

-    class MySQLLogData : ILogData

-    {

-        /// <summary>

-        /// The database manager

-        /// </summary>

-        public MySQLManager database;

-

-        /// <summary>

-        /// Artificial constructor called when the plugin is loaded

-        /// </summary>

-        public void Initialise()

-        {

-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");

-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");

-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");

-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");

-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");

-

-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);

-        }

-

-        /// <summary>

-        /// Saves a log item to the database

-        /// </summary>

-        /// <param name="serverDaemon">The daemon triggering the event</param>

-        /// <param name="target">The target of the action (region / agent UUID, etc)</param>

-        /// <param name="methodCall">The method call where the problem occured</param>

-        /// <param name="arguments">The arguments passed to the method</param>

-        /// <param name="priority">How critical is this?</param>

-        /// <param name="logMessage">The message to log</param>

-        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)

-        {

-            try

-            {

-                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);

-            }

-            catch

-            {

-                database.Reconnect();

-            }

-        }

-

-        /// <summary>

-        /// Returns the name of this DB provider

-        /// </summary>

-        /// <returns>A string containing the DB provider name</returns>

-        public string getName()

-        {

-            return "MySQL Logdata Interface";

-        }

-

-        /// <summary>

-        /// Closes the database provider

-        /// </summary>

-        public void Close()

-        {

-            // Do nothing.

-        }

-

-        /// <summary>

-        /// Returns the version of this DB provider

-        /// </summary>

-        /// <returns>A string containing the provider version</returns>

-        public string getVersion()

-        {

-            return "0.1";

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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;
+
+namespace OpenSim.Framework.Data.MySQL
+{
+    /// <summary>
+    /// An interface to the log database for MySQL
+    /// </summary>
+    class MySQLLogData : ILogData
+    {
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        public MySQLManager database;
+
+        /// <summary>
+        /// Artificial constructor called when the plugin is loaded
+        /// </summary>
+        public void Initialise()
+        {
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+
+        /// <summary>
+        /// Saves a log item to the database
+        /// </summary>
+        /// <param name="serverDaemon">The daemon triggering the event</param>
+        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
+        /// <param name="methodCall">The method call where the problem occured</param>
+        /// <param name="arguments">The arguments passed to the method</param>
+        /// <param name="priority">How critical is this?</param>
+        /// <param name="logMessage">The message to log</param>
+        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
+        {
+            try
+            {
+                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
+            }
+            catch
+            {
+                database.Reconnect();
+            }
+        }
+
+        /// <summary>
+        /// Returns the name of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider name</returns>
+        public string getName()
+        {
+            return "MySQL Logdata Interface";
+        }
+
+        /// <summary>
+        /// Closes the database provider
+        /// </summary>
+        public void Close()
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the provider version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index ab7f277..a5434c8 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -1,606 +1,606 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.Data;

-using libsecondlife;

-using MySql.Data.MySqlClient;

-

-namespace OpenSim.Framework.Data.MySQL

-{

-    /// <summary>

-    /// A MySQL Database manager

-    /// </summary>

-    class MySQLManager

-    {

-        /// <summary>

-        /// The database connection object

-        /// </summary>

-        IDbConnection dbcon;

-        /// <summary>

-        /// Connection string for ADO.net

-        /// </summary>

-        string connectionString;

-

-        /// <summary>

-        /// Initialises and creates a new MySQL connection and maintains it.

-        /// </summary>

-        /// <param name="hostname">The MySQL server being connected to</param>

-        /// <param name="database">The name of the MySQL database being used</param>

-        /// <param name="username">The username logging into the database</param>

-        /// <param name="password">The password for the user logging in</param>

-        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>

-        public MySQLManager(string hostname, string database, string username, string password, string cpooling, string port)

-        {

-            try

-            {

-                connectionString = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";

-                dbcon = new MySqlConnection(connectionString);

-

-                dbcon.Open();

-

-                Console.WriteLine("MySQL connection established");

-            }

-            catch (Exception e)

-            {

-                throw new Exception("Error initialising MySql Database: " + e.ToString());

-            }

-        }

-

-        /// <summary>

-        /// Shuts down the database connection

-        /// </summary>

-        public void Close()

-        {

-            dbcon.Close();

-            dbcon = null;

-        }

-

-        /// <summary>

-        /// Reconnects to the database

-        /// </summary>

-        public void Reconnect()

-        {

-            lock (dbcon)

-            {

-                try

-                {

-                    // Close the DB connection

-                    dbcon.Close();

-                    // Try reopen it

-                    dbcon = new MySqlConnection(connectionString);

-                    dbcon.Open();

-                }

-                catch (Exception e)

-                {

-                    Console.WriteLine("Unable to reconnect to database " + e.ToString());

-                }

-            }

-        }

-

-        /// <summary>

-        /// Runs a query with protection against SQL Injection by using parameterised input.

-        /// </summary>

-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>

-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>

-        /// <returns>A MySQL DB Command</returns>

-        public IDbCommand Query(string sql, Dictionary<string, string> parameters)

-        {

-            try

-            {

-                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();

-                dbcommand.CommandText = sql;

-                foreach (KeyValuePair<string, string> param in parameters)

-                {

-                    dbcommand.Parameters.Add(param.Key, param.Value);

-                }

-

-                return (IDbCommand)dbcommand;

-            }

-            catch

-            {

-                lock (dbcon)

-                {

-                    // Close the DB connection

-                    try

-                    {

-                        dbcon.Close();

-                    }

-                    catch { }

-

-                    // Try reopen it

-                    try

-                    {

-                        dbcon = new MySqlConnection(connectionString);

-                        dbcon.Open();

-                    }

-                    catch (Exception e)

-                    {

-                        Console.WriteLine("Unable to reconnect to database " + e.ToString());

-                    }

-

-                    // Run the query again

-                    try

-                    {

-                        MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();

-                        dbcommand.CommandText = sql;

-                        foreach (KeyValuePair<string, string> param in parameters)

-                        {

-                            dbcommand.Parameters.Add(param.Key, param.Value);

-                        }

-

-                        return (IDbCommand)dbcommand;

-                    }

-                    catch (Exception e)

-                    {

-                        // Return null if it fails.

-                        Console.WriteLine("Failed during Query generation: " + e.ToString());

-                        return null;

-                    }

-                }

-            }

-        }

-

-        /// <summary>

-        /// Reads a region row from a database reader

-        /// </summary>

-        /// <param name="reader">An active database reader</param>

-        /// <returns>A region profile</returns>

-        public SimProfileData readSimRow(IDataReader reader)

-        {

-            SimProfileData retval = new SimProfileData();

-

-            if (reader.Read())

-            {

-                // Region Main

-                retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());

-                retval.regionName = (string)reader["regionName"];

-                retval.UUID = new LLUUID((string)reader["uuid"]);

-

-                // Secrets

-                retval.regionRecvKey = (string)reader["regionRecvKey"];

-                retval.regionSecret = (string)reader["regionSecret"];

-                retval.regionSendKey = (string)reader["regionSendKey"];

-

-                // Region Server

-                retval.regionDataURI = (string)reader["regionDataURI"];

-                retval.regionOnline = false; // Needs to be pinged before this can be set.

-                retval.serverIP = (string)reader["serverIP"];

-                retval.serverPort = (uint)reader["serverPort"];

-                retval.serverURI = (string)reader["serverURI"];

-                retval.httpPort = Convert.ToUInt32(reader["serverHttpPort"].ToString());

-                retval.remotingPort = Convert.ToUInt32(reader["serverRemotingPort"].ToString());

-

-                // Location

-                retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());

-                retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());

-                retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());

-

-                // Neighbours - 0 = No Override

-                retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());

-                retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());

-                retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());

-                retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());

-

-                // Assets

-                retval.regionAssetURI = (string)reader["regionAssetURI"];

-                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];

-                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];

-

-                // Userserver

-                retval.regionUserURI = (string)reader["regionUserURI"];

-                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];

-                retval.regionUserSendKey = (string)reader["regionUserSendKey"];

-

-                // World Map Addition

-                string tempRegionMap = reader["regionMapTexture"].ToString();

-                if (tempRegionMap != "")

-                {

-                    retval.regionMapTextureID = new LLUUID(tempRegionMap);

-                }

-                else

-                {

-                    retval.regionMapTextureID = new LLUUID();

-                }

-            }

-            else

-            {

-                return null;

-            }

-            return retval;

-        }

-

-        /// <summary>

-        /// Reads a reservation row from a database reader

-        /// </summary>

-        /// <param name="reader">An active database reader</param>

-        /// <returns>A reservation data object</returns>

-        public ReservationData readReservationRow(IDataReader reader)

-        {

-            ReservationData retval = new ReservationData();

-            if (reader.Read())

-            {

-                retval.gridRecvKey = (string)reader["gridRecvKey"];

-                retval.gridSendKey = (string)reader["gridSendKey"];

-                retval.reservationCompany = (string)reader["resCompany"];

-                retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());

-                retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());

-                retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());

-                retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());

-                retval.reservationName = (string)reader["resName"];

-                retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;

-                retval.userUUID = new LLUUID((string)reader["userUUID"]);

-

-            }

-            else

-            {

-                return null;

-            }

-            return retval;

-        }

-        /// <summary>

-        /// Reads an agent row from a database reader

-        /// </summary>

-        /// <param name="reader">An active database reader</param>

-        /// <returns>A user session agent</returns>

-        public UserAgentData readAgentRow(IDataReader reader)

-        {

-            UserAgentData retval = new UserAgentData();

-

-            if (reader.Read())

-            {

-                // Agent IDs

-                retval.UUID = new LLUUID((string)reader["UUID"]);

-                retval.sessionID = new LLUUID((string)reader["sessionID"]);

-                retval.secureSessionID = new LLUUID((string)reader["secureSessionID"]);

-

-                // Agent Who?

-                retval.agentIP = (string)reader["agentIP"];

-                retval.agentPort = Convert.ToUInt32(reader["agentPort"].ToString());

-                retval.agentOnline = Convert.ToBoolean(reader["agentOnline"].ToString());

-

-                // Login/Logout times (UNIX Epoch)

-                retval.loginTime = Convert.ToInt32(reader["loginTime"].ToString());

-                retval.logoutTime = Convert.ToInt32(reader["logoutTime"].ToString());

-

-                // Current position

-                retval.currentRegion = (string)reader["currentRegion"];

-                retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());

-                LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);

-            }

-            else

-            {

-                return null;

-            }

-            return retval;

-        }

-

-        /// <summary>

-        /// Reads a user profile from an active data reader

-        /// </summary>

-        /// <param name="reader">An active database reader</param>

-        /// <returns>A user profile</returns>

-        public UserProfileData readUserRow(IDataReader reader)

-        {

-            UserProfileData retval = new UserProfileData();

-

-            if (reader.Read())

-            {

-                retval.UUID = new LLUUID((string)reader["UUID"]);

-                retval.username = (string)reader["username"];

-                retval.surname = (string)reader["lastname"];

-

-                retval.passwordHash = (string)reader["passwordHash"];

-                retval.passwordSalt = (string)reader["passwordSalt"];

-

-                retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());

-                retval.homeLocation = new LLVector3(

-                    Convert.ToSingle(reader["homeLocationX"].ToString()),

-                    Convert.ToSingle(reader["homeLocationY"].ToString()),

-                    Convert.ToSingle(reader["homeLocationZ"].ToString()));

-                retval.homeLookAt = new LLVector3(

-                    Convert.ToSingle(reader["homeLookAtX"].ToString()),

-                    Convert.ToSingle(reader["homeLookAtY"].ToString()),

-                    Convert.ToSingle(reader["homeLookAtZ"].ToString()));

-

-                retval.created = Convert.ToInt32(reader["created"].ToString());

-                retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString());

-

-                retval.userInventoryURI = (string)reader["userInventoryURI"];

-                retval.userAssetURI = (string)reader["userAssetURI"];

-

-                retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());

-                retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());

-

-                retval.profileAboutText = (string)reader["profileAboutText"];

-                retval.profileFirstText = (string)reader["profileFirstText"];

-

-                retval.profileImage = new LLUUID((string)reader["profileImage"]);

-                retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);

-

-            }

-            else

-            {

-                return null;

-            }

-            return retval;

-        }

-

-        /// <summary>

-        /// Reads a list of inventory folders returned by a query.

-        /// </summary>

-        /// <param name="reader">A MySQL Data Reader</param>

-        /// <returns>A List containing inventory folders</returns>

-        public List<InventoryFolderBase> readInventoryFolders(IDataReader reader)

-        {

-            List<InventoryFolderBase> rows = new List<InventoryFolderBase>();

-

-            while(reader.Read())

-            {

-                try

-                {

-                    InventoryFolderBase folder = new InventoryFolderBase();

-

-                    folder.agentID = new LLUUID((string)reader["agentID"]);

-                    folder.parentID = new LLUUID((string)reader["parentFolderID"]);

-                    folder.folderID = new LLUUID((string)reader["folderID"]);

-                    folder.name = (string)reader["folderName"];

-

-                    rows.Add(folder);

-                }

-                catch (Exception e)

-                {

-                    Console.WriteLine(e.ToString());

-                }

-            }

-

-            return rows;

-        }

-

-        /// <summary>

-        /// Reads a collection of items from an SQL result

-        /// </summary>

-        /// <param name="reader">The SQL Result</param>

-        /// <returns>A List containing Inventory Items</returns>

-        public List<InventoryItemBase> readInventoryItems(IDataReader reader)

-        {

-            List<InventoryItemBase> rows = new List<InventoryItemBase>();

-

-            while (reader.Read())

-            {

-                try

-                {

-                    InventoryItemBase item = new InventoryItemBase();

-

-                    item.assetID = new LLUUID((string)reader["assetID"]);

-                    item.avatarID = new LLUUID((string)reader["avatarID"]);

-                    item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());

-                    item.inventoryDescription = (string)reader["inventoryDescription"];

-                    item.inventoryID = new LLUUID((string)reader["inventoryID"]);

-                    item.inventoryName = (string)reader["inventoryName"];

-                    item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());

-                    item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);

-                    item.type = Convert.ToInt32(reader["type"].ToString());

-

-                    rows.Add(item);

-                }

-                catch (Exception e)

-                {

-                    Console.WriteLine(e.ToString());

-                }

-            }

-

-            return rows;

-        }

-

-        /// <summary>

-        /// Inserts a new row into the log database

-        /// </summary>

-        /// <param name="serverDaemon">The daemon which triggered this event</param>

-        /// <param name="target">Who were we operating on when this occured (region UUID, user UUID, etc)</param>

-        /// <param name="methodCall">The method call where the problem occured</param>

-        /// <param name="arguments">The arguments passed to the method</param>

-        /// <param name="priority">How critical is this?</param>

-        /// <param name="logMessage">Extra message info</param>

-        /// <returns>Saved successfully?</returns>

-        public bool insertLogRow(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)

-        {

-            string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";

-            sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";

-

-            Dictionary<string, string> parameters = new Dictionary<string, string>();

-            parameters["?server"] = serverDaemon;

-            parameters["?target"] = target;

-            parameters["?method"] = methodCall;

-            parameters["?arguments"] = arguments;

-            parameters["?priority"] = priority.ToString();

-            parameters["?message"] = logMessage;

-

-            bool returnval = false;

-

-            try

-            {

-                IDbCommand result = Query(sql, parameters);

-

-                if (result.ExecuteNonQuery() == 1)

-                    returnval = true;

-

-                result.Dispose();

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine(e.ToString());

-                return false;

-            }

-

-            return returnval;

-        }

-

-        /// <summary>

-        /// Inserts a new item into the database

-        /// </summary>

-        /// <param name="item">The item</param>

-        /// <returns>Success?</returns>

-        public bool insertItem(InventoryItemBase item)

-        {

-            string sql = "REPLACE INTO inventoryitems (inventoryID, assetID, type, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions) VALUES ";

-            sql += "(?inventoryID, ?assetID, ?type, ?parentFolderID, ?avatarID, ?inventoryName, ?inventoryDescription, ?inventoryNextPermissions, ?inventoryCurrentPermissions)";

-

-            Dictionary<string, string> parameters = new Dictionary<string, string>();

-            parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();

-            parameters["?assetID"] = item.assetID.ToStringHyphenated();

-            parameters["?type"] = item.type.ToString();

-            parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();

-            parameters["?avatarID"] = item.avatarID.ToStringHyphenated();

-            parameters["?inventoryName"] = item.inventoryName;

-            parameters["?inventoryDescription"] = item.inventoryDescription;

-            parameters["?inventoryNextPermissions"] = item.inventoryNextPermissions.ToString();

-            parameters["?inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString();

-

-            bool returnval = false;

-

-            try

-            {

-                IDbCommand result = Query(sql, parameters);

-

-                if (result.ExecuteNonQuery() == 1)

-                    returnval = true;

-

-                result.Dispose();

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine(e.ToString());

-                return false;

-            }

-

-            return returnval;

-        }

-

-        /// <summary>

-        /// Inserts a new folder into the database

-        /// </summary>

-        /// <param name="folder">The folder</param>

-        /// <returns>Success?</returns>

-        public bool insertFolder(InventoryFolderBase folder)

-        {

-            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName) VALUES ";

-            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName)";

-

-            Dictionary<string, string> parameters = new Dictionary<string, string>();

-            parameters["?folderID"] = folder.folderID.ToStringHyphenated();

-            parameters["?agentID"] = folder.agentID.ToStringHyphenated();

-            parameters["?parentFolderID"] = folder.parentID.ToStringHyphenated();

-            parameters["?folderName"] = folder.name;

-

-            bool returnval = false;

-            try

-            {

-                IDbCommand result = Query(sql, parameters);

-

-                if (result.ExecuteNonQuery() == 1)

-                    returnval = true;

-

-                result.Dispose();

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine(e.ToString());

-                return false;

-            }

-            return returnval;

-        }

-

-        /// <summary>

-        /// Inserts a new region into the database

-        /// </summary>

-        /// <param name="profile">The region to insert</param>

-        /// <returns>Success?</returns>

-        public bool insertRegion(SimProfileData regiondata)

-        {

-            string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";

-            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";

-            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort) VALUES ";

-

-            sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";

-            sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";

-            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort);";

-

-            Dictionary<string, string> parameters = new Dictionary<string, string>();

-

-            parameters["?regionHandle"] = regiondata.regionHandle.ToString();

-            parameters["?regionName"] = regiondata.regionName.ToString();

-            parameters["?uuid"] = regiondata.UUID.ToStringHyphenated();

-            parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString();

-            parameters["?regionSecret"] = regiondata.regionSecret.ToString();

-            parameters["?regionSendKey"] = regiondata.regionSendKey.ToString();

-            parameters["?regionDataURI"] = regiondata.regionDataURI.ToString();

-            parameters["?serverIP"] = regiondata.serverIP.ToString();

-            parameters["?serverPort"] = regiondata.serverPort.ToString();

-            parameters["?serverURI"] = regiondata.serverURI.ToString();

-            parameters["?locX"] = regiondata.regionLocX.ToString();

-            parameters["?locY"] = regiondata.regionLocY.ToString();

-            parameters["?locZ"] = regiondata.regionLocZ.ToString();

-            parameters["?eastOverrideHandle"] = regiondata.regionEastOverrideHandle.ToString();

-            parameters["?westOverrideHandle"] = regiondata.regionWestOverrideHandle.ToString();

-            parameters["?northOverrideHandle"] = regiondata.regionNorthOverrideHandle.ToString();

-            parameters["?southOverrideHandle"] = regiondata.regionSouthOverrideHandle.ToString();

-            parameters["?regionAssetURI"] = regiondata.regionAssetURI.ToString();

-            parameters["?regionAssetRecvKey"] = regiondata.regionAssetRecvKey.ToString();

-            parameters["?regionAssetSendKey"] = regiondata.regionAssetSendKey.ToString();

-            parameters["?regionUserURI"] = regiondata.regionUserURI.ToString();

-            parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();

-            parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();

-            parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated();

-            parameters["?serverHttpPort"] = regiondata.httpPort.ToString();

-            parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();

-

-            bool returnval = false;

-

-            try

-            {

-                

-                IDbCommand result = Query(sql, parameters);

-

-                //Console.WriteLine(result.CommandText);

-

-                if (result.ExecuteNonQuery() == 1)

-                    returnval = true;

-

-                result.Dispose();

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine(e.ToString());

-                return false;

-            }

-

-            return returnval;

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Data;
+using libsecondlife;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Database manager
+    /// </summary>
+    class MySQLManager
+    {
+        /// <summary>
+        /// The database connection object
+        /// </summary>
+        IDbConnection dbcon;
+        /// <summary>
+        /// Connection string for ADO.net
+        /// </summary>
+        string connectionString;
+
+        /// <summary>
+        /// Initialises and creates a new MySQL connection and maintains it.
+        /// </summary>
+        /// <param name="hostname">The MySQL server being connected to</param>
+        /// <param name="database">The name of the MySQL database being used</param>
+        /// <param name="username">The username logging into the database</param>
+        /// <param name="password">The password for the user logging in</param>
+        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
+        public MySQLManager(string hostname, string database, string username, string password, string cpooling, string port)
+        {
+            try
+            {
+                connectionString = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";
+                dbcon = new MySqlConnection(connectionString);
+
+                dbcon.Open();
+
+                Console.WriteLine("MySQL connection established");
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Error initialising MySql Database: " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Shuts down the database connection
+        /// </summary>
+        public void Close()
+        {
+            dbcon.Close();
+            dbcon = null;
+        }
+
+        /// <summary>
+        /// Reconnects to the database
+        /// </summary>
+        public void Reconnect()
+        {
+            lock (dbcon)
+            {
+                try
+                {
+                    // Close the DB connection
+                    dbcon.Close();
+                    // Try reopen it
+                    dbcon = new MySqlConnection(connectionString);
+                    dbcon.Open();
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("Unable to reconnect to database " + e.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Runs a query with protection against SQL Injection by using parameterised input.
+        /// </summary>
+        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
+        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
+        /// <returns>A MySQL DB Command</returns>
+        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
+        {
+            try
+            {
+                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
+                dbcommand.CommandText = sql;
+                foreach (KeyValuePair<string, string> param in parameters)
+                {
+                    dbcommand.Parameters.Add(param.Key, param.Value);
+                }
+
+                return (IDbCommand)dbcommand;
+            }
+            catch
+            {
+                lock (dbcon)
+                {
+                    // Close the DB connection
+                    try
+                    {
+                        dbcon.Close();
+                    }
+                    catch { }
+
+                    // Try reopen it
+                    try
+                    {
+                        dbcon = new MySqlConnection(connectionString);
+                        dbcon.Open();
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("Unable to reconnect to database " + e.ToString());
+                    }
+
+                    // Run the query again
+                    try
+                    {
+                        MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
+                        dbcommand.CommandText = sql;
+                        foreach (KeyValuePair<string, string> param in parameters)
+                        {
+                            dbcommand.Parameters.Add(param.Key, param.Value);
+                        }
+
+                        return (IDbCommand)dbcommand;
+                    }
+                    catch (Exception e)
+                    {
+                        // Return null if it fails.
+                        Console.WriteLine("Failed during Query generation: " + e.ToString());
+                        return null;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Reads a region row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A region profile</returns>
+        public SimProfileData readSimRow(IDataReader reader)
+        {
+            SimProfileData retval = new SimProfileData();
+
+            if (reader.Read())
+            {
+                // Region Main
+                retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
+                retval.regionName = (string)reader["regionName"];
+                retval.UUID = new LLUUID((string)reader["uuid"]);
+
+                // Secrets
+                retval.regionRecvKey = (string)reader["regionRecvKey"];
+                retval.regionSecret = (string)reader["regionSecret"];
+                retval.regionSendKey = (string)reader["regionSendKey"];
+
+                // Region Server
+                retval.regionDataURI = (string)reader["regionDataURI"];
+                retval.regionOnline = false; // Needs to be pinged before this can be set.
+                retval.serverIP = (string)reader["serverIP"];
+                retval.serverPort = (uint)reader["serverPort"];
+                retval.serverURI = (string)reader["serverURI"];
+                retval.httpPort = Convert.ToUInt32(reader["serverHttpPort"].ToString());
+                retval.remotingPort = Convert.ToUInt32(reader["serverRemotingPort"].ToString());
+
+                // Location
+                retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());
+                retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());
+                retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());
+
+                // Neighbours - 0 = No Override
+                retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());
+                retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());
+                retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());
+                retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());
+
+                // Assets
+                retval.regionAssetURI = (string)reader["regionAssetURI"];
+                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
+                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
+
+                // Userserver
+                retval.regionUserURI = (string)reader["regionUserURI"];
+                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
+                retval.regionUserSendKey = (string)reader["regionUserSendKey"];
+
+                // World Map Addition
+                string tempRegionMap = reader["regionMapTexture"].ToString();
+                if (tempRegionMap != "")
+                {
+                    retval.regionMapTextureID = new LLUUID(tempRegionMap);
+                }
+                else
+                {
+                    retval.regionMapTextureID = new LLUUID();
+                }
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Reads a reservation row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A reservation data object</returns>
+        public ReservationData readReservationRow(IDataReader reader)
+        {
+            ReservationData retval = new ReservationData();
+            if (reader.Read())
+            {
+                retval.gridRecvKey = (string)reader["gridRecvKey"];
+                retval.gridSendKey = (string)reader["gridSendKey"];
+                retval.reservationCompany = (string)reader["resCompany"];
+                retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());
+                retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());
+                retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());
+                retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
+                retval.reservationName = (string)reader["resName"];
+                retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
+                retval.userUUID = new LLUUID((string)reader["userUUID"]);
+
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+        /// <summary>
+        /// Reads an agent row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A user session agent</returns>
+        public UserAgentData readAgentRow(IDataReader reader)
+        {
+            UserAgentData retval = new UserAgentData();
+
+            if (reader.Read())
+            {
+                // Agent IDs
+                retval.UUID = new LLUUID((string)reader["UUID"]);
+                retval.sessionID = new LLUUID((string)reader["sessionID"]);
+                retval.secureSessionID = new LLUUID((string)reader["secureSessionID"]);
+
+                // Agent Who?
+                retval.agentIP = (string)reader["agentIP"];
+                retval.agentPort = Convert.ToUInt32(reader["agentPort"].ToString());
+                retval.agentOnline = Convert.ToBoolean(reader["agentOnline"].ToString());
+
+                // Login/Logout times (UNIX Epoch)
+                retval.loginTime = Convert.ToInt32(reader["loginTime"].ToString());
+                retval.logoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
+
+                // Current position
+                retval.currentRegion = (string)reader["currentRegion"];
+                retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
+                LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Reads a user profile from an active data reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData readUserRow(IDataReader reader)
+        {
+            UserProfileData retval = new UserProfileData();
+
+            if (reader.Read())
+            {
+                retval.UUID = new LLUUID((string)reader["UUID"]);
+                retval.username = (string)reader["username"];
+                retval.surname = (string)reader["lastname"];
+
+                retval.passwordHash = (string)reader["passwordHash"];
+                retval.passwordSalt = (string)reader["passwordSalt"];
+
+                retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
+                retval.homeLocation = new LLVector3(
+                    Convert.ToSingle(reader["homeLocationX"].ToString()),
+                    Convert.ToSingle(reader["homeLocationY"].ToString()),
+                    Convert.ToSingle(reader["homeLocationZ"].ToString()));
+                retval.homeLookAt = new LLVector3(
+                    Convert.ToSingle(reader["homeLookAtX"].ToString()),
+                    Convert.ToSingle(reader["homeLookAtY"].ToString()),
+                    Convert.ToSingle(reader["homeLookAtZ"].ToString()));
+
+                retval.created = Convert.ToInt32(reader["created"].ToString());
+                retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
+
+                retval.userInventoryURI = (string)reader["userInventoryURI"];
+                retval.userAssetURI = (string)reader["userAssetURI"];
+
+                retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
+                retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
+
+                retval.profileAboutText = (string)reader["profileAboutText"];
+                retval.profileFirstText = (string)reader["profileFirstText"];
+
+                retval.profileImage = new LLUUID((string)reader["profileImage"]);
+                retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
+
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Reads a list of inventory folders returned by a query.
+        /// </summary>
+        /// <param name="reader">A MySQL Data Reader</param>
+        /// <returns>A List containing inventory folders</returns>
+        public List<InventoryFolderBase> readInventoryFolders(IDataReader reader)
+        {
+            List<InventoryFolderBase> rows = new List<InventoryFolderBase>();
+
+            while(reader.Read())
+            {
+                try
+                {
+                    InventoryFolderBase folder = new InventoryFolderBase();
+
+                    folder.agentID = new LLUUID((string)reader["agentID"]);
+                    folder.parentID = new LLUUID((string)reader["parentFolderID"]);
+                    folder.folderID = new LLUUID((string)reader["folderID"]);
+                    folder.name = (string)reader["folderName"];
+
+                    rows.Add(folder);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
+            }
+
+            return rows;
+        }
+
+        /// <summary>
+        /// Reads a collection of items from an SQL result
+        /// </summary>
+        /// <param name="reader">The SQL Result</param>
+        /// <returns>A List containing Inventory Items</returns>
+        public List<InventoryItemBase> readInventoryItems(IDataReader reader)
+        {
+            List<InventoryItemBase> rows = new List<InventoryItemBase>();
+
+            while (reader.Read())
+            {
+                try
+                {
+                    InventoryItemBase item = new InventoryItemBase();
+
+                    item.assetID = new LLUUID((string)reader["assetID"]);
+                    item.avatarID = new LLUUID((string)reader["avatarID"]);
+                    item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
+                    item.inventoryDescription = (string)reader["inventoryDescription"];
+                    item.inventoryID = new LLUUID((string)reader["inventoryID"]);
+                    item.inventoryName = (string)reader["inventoryName"];
+                    item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
+                    item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
+                    item.type = Convert.ToInt32(reader["type"].ToString());
+
+                    rows.Add(item);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
+            }
+
+            return rows;
+        }
+
+        /// <summary>
+        /// Inserts a new row into the log database
+        /// </summary>
+        /// <param name="serverDaemon">The daemon which triggered this event</param>
+        /// <param name="target">Who were we operating on when this occured (region UUID, user UUID, etc)</param>
+        /// <param name="methodCall">The method call where the problem occured</param>
+        /// <param name="arguments">The arguments passed to the method</param>
+        /// <param name="priority">How critical is this?</param>
+        /// <param name="logMessage">Extra message info</param>
+        /// <returns>Saved successfully?</returns>
+        public bool insertLogRow(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
+        {
+            string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";
+            sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?server"] = serverDaemon;
+            parameters["?target"] = target;
+            parameters["?method"] = methodCall;
+            parameters["?arguments"] = arguments;
+            parameters["?priority"] = priority.ToString();
+            parameters["?message"] = logMessage;
+
+            bool returnval = false;
+
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+
+            return returnval;
+        }
+
+        /// <summary>
+        /// Inserts a new item into the database
+        /// </summary>
+        /// <param name="item">The item</param>
+        /// <returns>Success?</returns>
+        public bool insertItem(InventoryItemBase item)
+        {
+            string sql = "REPLACE INTO inventoryitems (inventoryID, assetID, type, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions) VALUES ";
+            sql += "(?inventoryID, ?assetID, ?type, ?parentFolderID, ?avatarID, ?inventoryName, ?inventoryDescription, ?inventoryNextPermissions, ?inventoryCurrentPermissions)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();
+            parameters["?assetID"] = item.assetID.ToStringHyphenated();
+            parameters["?type"] = item.type.ToString();
+            parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();
+            parameters["?avatarID"] = item.avatarID.ToStringHyphenated();
+            parameters["?inventoryName"] = item.inventoryName;
+            parameters["?inventoryDescription"] = item.inventoryDescription;
+            parameters["?inventoryNextPermissions"] = item.inventoryNextPermissions.ToString();
+            parameters["?inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString();
+
+            bool returnval = false;
+
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+
+            return returnval;
+        }
+
+        /// <summary>
+        /// Inserts a new folder into the database
+        /// </summary>
+        /// <param name="folder">The folder</param>
+        /// <returns>Success?</returns>
+        public bool insertFolder(InventoryFolderBase folder)
+        {
+            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName) VALUES ";
+            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?folderID"] = folder.folderID.ToStringHyphenated();
+            parameters["?agentID"] = folder.agentID.ToStringHyphenated();
+            parameters["?parentFolderID"] = folder.parentID.ToStringHyphenated();
+            parameters["?folderName"] = folder.name;
+
+            bool returnval = false;
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+            return returnval;
+        }
+
+        /// <summary>
+        /// Inserts a new region into the database
+        /// </summary>
+        /// <param name="profile">The region to insert</param>
+        /// <returns>Success?</returns>
+        public bool insertRegion(SimProfileData regiondata)
+        {
+            string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
+            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
+            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort) VALUES ";
+
+            sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
+            sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
+            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort);";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+
+            parameters["?regionHandle"] = regiondata.regionHandle.ToString();
+            parameters["?regionName"] = regiondata.regionName.ToString();
+            parameters["?uuid"] = regiondata.UUID.ToStringHyphenated();
+            parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString();
+            parameters["?regionSecret"] = regiondata.regionSecret.ToString();
+            parameters["?regionSendKey"] = regiondata.regionSendKey.ToString();
+            parameters["?regionDataURI"] = regiondata.regionDataURI.ToString();
+            parameters["?serverIP"] = regiondata.serverIP.ToString();
+            parameters["?serverPort"] = regiondata.serverPort.ToString();
+            parameters["?serverURI"] = regiondata.serverURI.ToString();
+            parameters["?locX"] = regiondata.regionLocX.ToString();
+            parameters["?locY"] = regiondata.regionLocY.ToString();
+            parameters["?locZ"] = regiondata.regionLocZ.ToString();
+            parameters["?eastOverrideHandle"] = regiondata.regionEastOverrideHandle.ToString();
+            parameters["?westOverrideHandle"] = regiondata.regionWestOverrideHandle.ToString();
+            parameters["?northOverrideHandle"] = regiondata.regionNorthOverrideHandle.ToString();
+            parameters["?southOverrideHandle"] = regiondata.regionSouthOverrideHandle.ToString();
+            parameters["?regionAssetURI"] = regiondata.regionAssetURI.ToString();
+            parameters["?regionAssetRecvKey"] = regiondata.regionAssetRecvKey.ToString();
+            parameters["?regionAssetSendKey"] = regiondata.regionAssetSendKey.ToString();
+            parameters["?regionUserURI"] = regiondata.regionUserURI.ToString();
+            parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();
+            parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();
+            parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated();
+            parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
+            parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
+
+            bool returnval = false;
+
+            try
+            {
+                
+                IDbCommand result = Query(sql, parameters);
+
+                //Console.WriteLine(result.CommandText);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+
+            return returnval;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index c116536..b044bdd 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -1,256 +1,256 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.Data;

-using libsecondlife;

-

-namespace OpenSim.Framework.Data.MySQL

-{

-    /// <summary>

-    /// A database interface class to a user profile storage system

-    /// </summary>

-    class MySQLUserData : IUserData

-    {

-        /// <summary>

-        /// Database manager for MySQL

-        /// </summary>

-        public MySQLManager database;

-

-        /// <summary>

-        /// Loads and initialises the MySQL storage plugin

-        /// </summary>

-        public void Initialise()

-        {

-            // Load from an INI file connection details

-            // TODO: move this to XML?

-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");

-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");

-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");

-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");

-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");

-

-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);

-        }

-

-        /// <summary>

-        /// Searches the database for a specified user profile

-        /// </summary>

-        /// <param name="name">The account name of the user</param>

-        /// <returns>A user profile</returns>

-        public UserProfileData getUserByName(string name)

-        {

-            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);

-        }

-

-        /// <summary>

-        /// Searches the database for a specified user profile by name components

-        /// </summary>

-        /// <param name="user">The first part of the account name</param>

-        /// <param name="last">The second part of the account name</param>

-        /// <returns>A user profile</returns>

-        public UserProfileData getUserByName(string user, string last)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?first"] = user;

-                    param["?second"] = last;

-

-                    IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    UserProfileData row = database.readUserRow(reader);

-                    

-                    reader.Close();

-                    result.Dispose();

-

-                    return row;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Searches the database for a specified user profile by UUID

-        /// </summary>

-        /// <param name="uuid">The account ID</param>

-        /// <returns>The users profile</returns>

-        public UserProfileData getUserByUUID(LLUUID uuid)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = uuid.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    UserProfileData row = database.readUserRow(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    return row;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Returns a user session searching by name

-        /// </summary>

-        /// <param name="name">The account name</param>

-        /// <returns>The users session</returns>

-        public UserAgentData getAgentByName(string name)

-        {

-            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);

-        }

-

-        /// <summary>

-        /// Returns a user session by account name

-        /// </summary>

-        /// <param name="user">First part of the users account name</param>

-        /// <param name="last">Second part of the users account name</param>

-        /// <returns>The users session</returns>

-        public UserAgentData getAgentByName(string user, string last)

-        {

-            UserProfileData profile = getUserByName(user, last);

-            return getAgentByUUID(profile.UUID);

-        }

-

-        /// <summary>

-        /// Returns an agent session by account UUID

-        /// </summary>

-        /// <param name="uuid">The accounts UUID</param>

-        /// <returns>The users session</returns>

-        public UserAgentData getAgentByUUID(LLUUID uuid)

-        {

-            try

-            {

-                lock (database)

-                {

-                    Dictionary<string, string> param = new Dictionary<string, string>();

-                    param["?uuid"] = uuid.ToStringHyphenated();

-

-                    IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);

-                    IDataReader reader = result.ExecuteReader();

-

-                    UserAgentData row = database.readAgentRow(reader);

-

-                    reader.Close();

-                    result.Dispose();

-

-                    return row;

-                }

-            }

-            catch (Exception e)

-            {

-                database.Reconnect();

-                Console.WriteLine(e.ToString());

-                return null;

-            }

-        }

-

-        /// <summary>

-        /// Creates a new users profile

-        /// </summary>

-        /// <param name="user">The user profile to create</param>

-        public void addNewUserProfile(UserProfileData user)

-        {

-        }

-

-        /// <summary>

-        /// Creates a new agent

-        /// </summary>

-        /// <param name="agent">The agent to create</param>

-        public void addNewUserAgent(UserAgentData agent)

-        {

-            // Do nothing.

-        }

-

-        /// <summary>

-        /// Performs a money transfer request between two accounts

-        /// </summary>

-        /// <param name="from">The senders account ID</param>

-        /// <param name="to">The recievers account ID</param>

-        /// <param name="amount">The amount to transfer</param>

-        /// <returns>Success?</returns>

-        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)

-        {

-            return false;

-        }

-

-        /// <summary>

-        /// Performs an inventory transfer request between two accounts

-        /// </summary>

-        /// <remarks>TODO: Move to inventory server</remarks>

-        /// <param name="from">The senders account ID</param>

-        /// <param name="to">The recievers account ID</param>

-        /// <param name="item">The item to transfer</param>

-        /// <returns>Success?</returns>

-        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)

-        {

-            return false;

-        }

-

-        /// <summary>

-        /// Database provider name

-        /// </summary>

-        /// <returns>Provider name</returns>

-        public string getName()

-        {

-            return "MySQL Userdata Interface";

-        }

-

-        /// <summary>

-        /// Database provider version

-        /// </summary>

-        /// <returns>provider version</returns>

-        public string getVersion()

-        {

-            return "0.1";

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Data;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A database interface class to a user profile storage system
+    /// </summary>
+    class MySQLUserData : IUserData
+    {
+        /// <summary>
+        /// Database manager for MySQL
+        /// </summary>
+        public MySQLManager database;
+
+        /// <summary>
+        /// Loads and initialises the MySQL storage plugin
+        /// </summary>
+        public void Initialise()
+        {
+            // Load from an INI file connection details
+            // TODO: move this to XML?
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+
+        /// <summary>
+        /// Searches the database for a specified user profile
+        /// </summary>
+        /// <param name="name">The account name of the user</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserByName(string name)
+        {
+            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
+
+        /// <summary>
+        /// Searches the database for a specified user profile by name components
+        /// </summary>
+        /// <param name="user">The first part of the account name</param>
+        /// <param name="last">The second part of the account name</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserByName(string user, string last)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?first"] = user;
+                    param["?second"] = last;
+
+                    IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    UserProfileData row = database.readUserRow(reader);
+                    
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Searches the database for a specified user profile by UUID
+        /// </summary>
+        /// <param name="uuid">The account ID</param>
+        /// <returns>The users profile</returns>
+        public UserProfileData getUserByUUID(LLUUID uuid)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = uuid.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    UserProfileData row = database.readUserRow(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a user session searching by name
+        /// </summary>
+        /// <param name="name">The account name</param>
+        /// <returns>The users session</returns>
+        public UserAgentData getAgentByName(string name)
+        {
+            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
+
+        /// <summary>
+        /// Returns a user session by account name
+        /// </summary>
+        /// <param name="user">First part of the users account name</param>
+        /// <param name="last">Second part of the users account name</param>
+        /// <returns>The users session</returns>
+        public UserAgentData getAgentByName(string user, string last)
+        {
+            UserProfileData profile = getUserByName(user, last);
+            return getAgentByUUID(profile.UUID);
+        }
+
+        /// <summary>
+        /// Returns an agent session by account UUID
+        /// </summary>
+        /// <param name="uuid">The accounts UUID</param>
+        /// <returns>The users session</returns>
+        public UserAgentData getAgentByUUID(LLUUID uuid)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = uuid.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    UserAgentData row = database.readAgentRow(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new users profile
+        /// </summary>
+        /// <param name="user">The user profile to create</param>
+        public void addNewUserProfile(UserProfileData user)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new agent
+        /// </summary>
+        /// <param name="agent">The agent to create</param>
+        public void addNewUserAgent(UserAgentData agent)
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Performs a money transfer request between two accounts
+        /// </summary>
+        /// <param name="from">The senders account ID</param>
+        /// <param name="to">The recievers account ID</param>
+        /// <param name="amount">The amount to transfer</param>
+        /// <returns>Success?</returns>
+        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Performs an inventory transfer request between two accounts
+        /// </summary>
+        /// <remarks>TODO: Move to inventory server</remarks>
+        /// <param name="from">The senders account ID</param>
+        /// <param name="to">The recievers account ID</param>
+        /// <param name="item">The item to transfer</param>
+        /// <returns>Success?</returns>
+        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Database provider name
+        /// </summary>
+        /// <returns>Provider name</returns>
+        public string getName()
+        {
+            return "MySQL Userdata Interface";
+        }
+
+        /// <summary>
+        /// Database provider version
+        /// </summary>
+        /// <returns>provider version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index 52d6a54..46c0ae0 100644
--- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -1,33 +1,33 @@
-using System.Reflection;

-using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]

-[assembly: AssemblyCopyright("Copyright ©  2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("e49826b2-dcef-41be-a5bd-596733fa3304")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Runtime.InteropServices;
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e49826b2-dcef-41be-a5bd-596733fa3304")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]