diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs
index 5f0de3807f..79c3301d50 100644
--- a/OpenSim/Framework/AvatarPickerAvatar.cs
+++ b/OpenSim/Framework/AvatarPickerAvatar.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Framework
-{
-    public class AvatarPickerAvatar
-    {
-        public LLUUID AvatarID;
-        public string firstName;
-        public string lastName;
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework
+{
+    public class AvatarPickerAvatar
+    {
+        public LLUUID AvatarID;
+        public string firstName;
+        public string lastName;
+    }
+}
diff --git a/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs b/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
index 27f467f27c..37b933c1f3 100644
--- a/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
+++ b/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
@@ -1,26 +1,26 @@
-using System;
-using System.Collections.Generic;
-using OpenSim.Framework;
-using OpenSim.Framework.Data;
-using OpenSim.Framework.Data.Base;
-using OpenSim.Framework.Data.MySQLMapper;
-
-namespace OpenSim.Framework.Data.MapperFactory
-{
-    public class DataMapperFactory
-    {
-        public enum MAPPER_TYPE {
-            MYSQL,
-        };
-
-        static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString)
-        {
-            switch (type) {
-                case MAPPER_TYPE.MYSQL:
-                    return new MySQLDatabaseMapper(connectionString);
-                default:
-                    return null;
-            }            
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Data.Base;
+using OpenSim.Framework.Data.MySQLMapper;
+
+namespace OpenSim.Framework.Data.MapperFactory
+{
+    public class DataMapperFactory
+    {
+        public enum MAPPER_TYPE {
+            MYSQL,
+        };
+
+        static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString)
+        {
+            switch (type) {
+                case MAPPER_TYPE.MYSQL:
+                    return new MySQLDatabaseMapper(connectionString);
+                default:
+                    return null;
+            }            
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data/AssetDataBase.cs b/OpenSim/Framework/Data/AssetDataBase.cs
index 21623581f1..0f3044eb27 100644
--- a/OpenSim/Framework/Data/AssetDataBase.cs
+++ b/OpenSim/Framework/Data/AssetDataBase.cs
@@ -1,20 +1,20 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Framework.Data
-{
-    public abstract class AssetDataBase : IAssetProvider
-    {
-        public abstract AssetBase FetchAsset(LLUUID uuid);
-        public abstract void CreateAsset(AssetBase asset);
-        public abstract void UpdateAsset(AssetBase asset);
-        public abstract bool ExistsAsset(LLUUID uuid);
-        public abstract void CommitAssets();
-
-        public abstract string Version { get; }
-        public abstract string Name { get; }
-        public abstract void Initialise();
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    public abstract class AssetDataBase : IAssetProvider
+    {
+        public abstract AssetBase FetchAsset(LLUUID uuid);
+        public abstract void CreateAsset(AssetBase asset);
+        public abstract void UpdateAsset(AssetBase asset);
+        public abstract bool ExistsAsset(LLUUID uuid);
+        public abstract void CommitAssets();
+
+        public abstract string Version { get; }
+        public abstract string Name { get; }
+        public abstract void Initialise();
+    }
+}
diff --git a/OpenSim/Framework/Data/DataStoreBase.cs b/OpenSim/Framework/Data/DataStoreBase.cs
index 671d0f03a7..92604f2e17 100644
--- a/OpenSim/Framework/Data/DataStoreBase.cs
+++ b/OpenSim/Framework/Data/DataStoreBase.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Data
-{
-    public abstract class DataStoreBase
-    {
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Data
+{
+    public abstract class DataStoreBase
+    {
+    }
+}
diff --git a/OpenSim/Framework/Data/GridDataBase.cs b/OpenSim/Framework/Data/GridDataBase.cs
index 32a729a550..9d6e832dfa 100644
--- a/OpenSim/Framework/Data/GridDataBase.cs
+++ b/OpenSim/Framework/Data/GridDataBase.cs
@@ -1,22 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Framework.Data
-{
-    public abstract class GridDataBase : IGridData
-    {
-        public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
-        public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID);
-        public abstract RegionProfileData GetProfileByString(string regionName);
-        public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
-        public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
-        public abstract void Initialise();
-        public abstract void Close();
-        public abstract string getName();
-        public abstract string getVersion();
-        public abstract DataResponse AddProfile(RegionProfileData profile);
-        public abstract ReservationData GetReservationAtPoint(uint x, uint y);
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    public abstract class GridDataBase : IGridData
+    {
+        public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
+        public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID);
+        public abstract RegionProfileData GetProfileByString(string regionName);
+        public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
+        public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
+        public abstract void Initialise();
+        public abstract void Close();
+        public abstract string getName();
+        public abstract string getVersion();
+        public abstract DataResponse AddProfile(RegionProfileData profile);
+        public abstract ReservationData GetReservationAtPoint(uint x, uint y);
+    }
+}
diff --git a/OpenSim/Framework/Data/InventoryDataBase.cs b/OpenSim/Framework/Data/InventoryDataBase.cs
index d88acff35a..afddbf1163 100644
--- a/OpenSim/Framework/Data/InventoryDataBase.cs
+++ b/OpenSim/Framework/Data/InventoryDataBase.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Data
-{
-    public abstract class InventoryDataBase
-    {
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Data
+{
+    public abstract class InventoryDataBase
+    {
+    }
+}
diff --git a/OpenSim/Framework/Data/UserDataBase.cs b/OpenSim/Framework/Data/UserDataBase.cs
index 7a74693f70..5e0be45050 100644
--- a/OpenSim/Framework/Data/UserDataBase.cs
+++ b/OpenSim/Framework/Data/UserDataBase.cs
@@ -1,29 +1,29 @@
-using System.Collections.Generic;
-using libsecondlife;
-
-namespace OpenSim.Framework.Data
-{
-    public abstract class UserDataBase : IUserData
-    {
-        public abstract UserProfileData GetUserByUUID(LLUUID user);
-        public abstract UserProfileData GetUserByName(string fname, string lname);        
-        public abstract UserAgentData GetAgentByUUID(LLUUID user);
-        public abstract UserAgentData GetAgentByName(string name);
-        public abstract UserAgentData GetAgentByName(string fname, string lname);
-        public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey);
-        public abstract void AddNewUserProfile(UserProfileData user);
-        public abstract bool UpdateUserProfile(UserProfileData user);
-        public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid);
-        public abstract void AddNewUserAgent(UserAgentData agent);
-        public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms);
-        public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend);
-        public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms);
-        public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
-        public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
-        public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
-        public abstract string GetVersion();
-        public abstract string getName();
-        public abstract void Initialise();
-        public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
-    }
-}
+using System.Collections.Generic;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    public abstract class UserDataBase : IUserData
+    {
+        public abstract UserProfileData GetUserByUUID(LLUUID user);
+        public abstract UserProfileData GetUserByName(string fname, string lname);        
+        public abstract UserAgentData GetAgentByUUID(LLUUID user);
+        public abstract UserAgentData GetAgentByName(string name);
+        public abstract UserAgentData GetAgentByName(string fname, string lname);
+        public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey);
+        public abstract void AddNewUserProfile(UserProfileData user);
+        public abstract bool UpdateUserProfile(UserProfileData user);
+        public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid);
+        public abstract void AddNewUserAgent(UserAgentData agent);
+        public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms);
+        public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend);
+        public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms);
+        public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
+        public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
+        public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
+        public abstract string GetVersion();
+        public abstract string getName();
+        public abstract void Initialise();
+        public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
+    }
+}