Merge branch 'master' into careminster-presence-refactor

11 files changed, 22 insertions, 22 deletions

diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index abd2cef..bd7a435 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data
     /// </summary>
     public interface IGridUserData 
     {
-        GridUserData GetGridUserData(string userID);        
+        GridUserData GetGridUserData(string userID);
         bool StoreGridUserData(GridUserData data);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
index 4992183..49a6b09 100644
--- a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.MSSQL
         
         public MSSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")
-        {            
+        {
         }
 
         public bool Delete(UUID principalID, string name)
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
index 506056d..904366e 100644
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Data.MSSQL
         {
             List<string> constraints = new List<string>();
             string query = string.Format(@"SELECT 
-                            COL_NAME(ic.object_id,ic.column_id) AS column_name                                
+                            COL_NAME(ic.object_id,ic.column_id) AS column_name
                             FROM sys.indexes AS i
                             INNER JOIN sys.index_columns AS ic 
                               ON i.object_id = ic.object_id AND i.index_id = ic.index_id
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MSSQL
                 string where = String.Join(" AND ", terms.ToArray());
 
                 string query = String.Format("SELECT * FROM {0} WHERE {1}",
-                        m_Realm, where);                
+                        m_Realm, where);
 
                 cmd.Connection = conn;
                 cmd.CommandText = query;
@@ -296,7 +296,7 @@ namespace OpenSim.Data.MSSQL
                 query.AppendFormat("[{0}] = {1} ", names[i], values[i]);
                 if (constraints.Count > 0)
                 {
-                    List<string> terms = new List<string>();       
+                    List<string> terms = new List<string>();
                     for (int j = 0; j < constraints.Count; j++)
                     {
                         terms.Add(" [" + constraints[j].Key + "] = @" + constraints[j].Key);
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index b4a945c..9993720 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.MSSQL
 
         public MSSQLGridUserData(string connectionString, string realm) :
             base(connectionString, realm, "UserGrid")
-        {            
+        {
         }
 
         public GridUserData GetGridUserData(string userID)
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MSSQL
                 return null;
 
             return ret[0];
-        }   
+        }
 
         public bool StoreGridUserData(GridUserData data)
         {
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 4309b42..575fd21 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// Connection string for ADO.net
         /// </summary>
-        private readonly string connectionString;      
+        private readonly string connectionString;
 
         /// <summary>
         /// Initialize the manager and set the connectionstring
@@ -196,7 +196,7 @@ namespace OpenSim.Data.MSSQL
 
                 migration.Update();
             }
-        }        
+        }
 
         /// <summary>
         /// Returns the version of this DB provider
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 9f18e5e..e7c8dc5 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
         {
         }
         //private string m_Realm;
-        //private List<string> m_ColumnNames = null;        
+        //private List<string> m_ColumnNames = null;
         //private MSSQLManager m_database;
 
         //public MSSQLUserAccountData(string connectionString, string realm)
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 756b42d..1253e0b 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Data.MySQL
         public virtual T[] Get(string where)
         {
             using (MySqlCommand cmd = new MySqlCommand())
-            {            
+            {
                 string query = String.Format("select * from {0} where {1}",
                                              m_Realm, where);
                 
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index 15834d2..df29ecd 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data.MySQL
                 return null;
 
             return ret[0];
-        }        
+        }
 
         public bool StoreGridUserData(GridUserData data)
         {
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 68a68af..143dbe3 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Data.MySQL
                     List<UUID> deleteSessions = new List<UUID>();
                     int online = 0;
 
-                    while(reader.Read())
+                    while (reader.Read())
                     {
                         if (bool.Parse(reader["Online"].ToString()))
                             online++;
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index 9fc4595..b98b5c9 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Data.Null
         }
 
         public bool Store(PresenceData data)
-        {                      
+        {
             if (Instance != this)
                 return Instance.Store(data);
 
@@ -113,7 +113,7 @@ namespace OpenSim.Data.Null
         }
 
         public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {            
+        {
             if (Instance != this)
                 return Instance.SetHomeLocation(userID, regionID, position, lookAt);
 
@@ -130,28 +130,28 @@ namespace OpenSim.Data.Null
                     p.Data["HomePosition"] = position.ToString();
                     p.Data["HomeLookAt"] = lookAt.ToString();
                     foundone = true;
-                }                
+                }
             }
 
             return foundone;
         }
 
         public PresenceData[] Get(string field, string data)
-        {            
+        {
             if (Instance != this)
                 return Instance.Get(field, data);
 
 //            m_log.DebugFormat(
-//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);            
+//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);
 
             List<PresenceData> presences = new List<PresenceData>();
             if (field == "UserID")
             {
                 foreach (PresenceData p in m_presenceData.Values)
                 {
-                    if (p.UserID == data)                        
+                    if (p.UserID == data)
                     {
-                        presences.Add(p);                    
+                        presences.Add(p);
 //                        Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
                     }
                 }
@@ -194,7 +194,7 @@ namespace OpenSim.Data.Null
         }
 
         public void Prune(string userID)
-        {                       
+        {
             if (Instance != this)
             {
                 Instance.Prune(userID);
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 84ce775..2c28375 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool Store(AuthenticationData data)
-        {            
+        {
             if (data.Data.ContainsKey("UUID"))
                 data.Data.Remove("UUID");