Update svn properties. Formatting cleanup. Remove a compiler warning.

3 files changed, 31 insertions, 27 deletions

diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index f8641bc..78d4446 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -101,8 +101,10 @@ namespace OpenSim.Data.MySQL
                                    BindingFlags.DeclaredOnly);
 
             foreach (FieldInfo f in m_Fields)
-                if(f.Name.Substring(0, 2) == "m_")
+            {
+                if (f.Name.Substring(0, 2) == "m_")
                     m_FieldMap[f.Name.Substring(2)] = f;
+            }
         }
         
         private string[] FieldList
@@ -171,14 +173,14 @@ namespace OpenSim.Data.MySQL
 
             IDataReader r = cmd.ExecuteReader();
 
-            if(r.Read())
+            if (r.Read())
             {
                 foreach (string name in FieldList)
                 {
-                    if(m_FieldMap[name].GetValue(es) is bool)
+                    if (m_FieldMap[name].GetValue(es) is bool)
                     {
                         int v = Convert.ToInt32(r[name]);
-                        if(v != 0)
+                        if (v != 0)
                             m_FieldMap[name].SetValue(es, true);
                         else
                             m_FieldMap[name].SetValue(es, false);
@@ -207,9 +209,9 @@ namespace OpenSim.Data.MySQL
 
                 foreach (string name in FieldList)
                 {
-                    if(m_FieldMap[name].GetValue(es) is bool)
+                    if (m_FieldMap[name].GetValue(es) is bool)
                     {
-                        if((bool)m_FieldMap[name].GetValue(es))
+                        if ((bool)m_FieldMap[name].GetValue(es))
                             cmd.Parameters.AddWithValue("?"+name, "1");
                         else
                             cmd.Parameters.AddWithValue("?"+name, "0");
@@ -283,9 +285,9 @@ namespace OpenSim.Data.MySQL
 
             foreach (string name in FieldList)
             {
-                if(m_FieldMap[name].GetValue(es) is bool)
+                if (m_FieldMap[name].GetValue(es) is bool)
                 {
-                    if((bool)m_FieldMap[name].GetValue(es))
+                    if ((bool)m_FieldMap[name].GetValue(es))
                         cmd.Parameters.AddWithValue("?"+name, "1");
                     else
                         cmd.Parameters.AddWithValue("?"+name, "0");
@@ -317,7 +319,7 @@ namespace OpenSim.Data.MySQL
 
             IDataReader r = cmd.ExecuteReader();
 
-            while(r.Read())
+            while (r.Read())
             {
                 EstateBan eb = new EstateBan();
 
@@ -347,7 +349,7 @@ namespace OpenSim.Data.MySQL
 
             cmd.CommandText = "insert into estateban (EstateID, bannedUUID) values ( ?EstateID, ?bannedUUID )";
             
-            foreach(EstateBan b in es.EstateBans)
+            foreach (EstateBan b in es.EstateBans)
             {
                 cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
                 cmd.Parameters.AddWithValue("?bannedUUID", b.bannedUUID.ToString());
@@ -372,7 +374,7 @@ namespace OpenSim.Data.MySQL
 
             cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )";
             
-            foreach(LLUUID uuid in data)
+            foreach (LLUUID uuid in data)
             {
                 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
                 cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
@@ -395,7 +397,7 @@ namespace OpenSim.Data.MySQL
 
             IDataReader r = cmd.ExecuteReader();
 
-            while(r.Read())
+            while (r.Read())
             {
                 // EstateBan eb = new EstateBan();
 
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 823b81b..99de5cd 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Data.SQLite
         /// <returns>Asset base</returns>
         override public AssetBase FetchAsset(LLUUID uuid)
         {
-            lock(this)
+            lock (this)
             {
                 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
                 {
@@ -130,7 +130,8 @@ namespace OpenSim.Data.SQLite
             }
             else
             {
-                lock(this) {
+                lock (this)
+                {
                     using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
                     {
                         cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
@@ -155,7 +156,8 @@ namespace OpenSim.Data.SQLite
         {
             LogAssetLoad(asset);
             
-            lock(this) {
+            lock (this)
+            {
                 using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
                 {
                     cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index db85239..93d86b6 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Data.SQLite
                                    BindingFlags.DeclaredOnly);
 
             foreach (FieldInfo f in m_Fields)
-                if(f.Name.Substring(0, 2) == "m_")
+                if (f.Name.Substring(0, 2) == "m_")
                     m_FieldMap[f.Name.Substring(2)] = f;
         }
         
@@ -97,14 +97,14 @@ namespace OpenSim.Data.SQLite
 
             IDataReader r = cmd.ExecuteReader();
 
-            if(r.Read())
+            if (r.Read())
             {
                 foreach (string name in FieldList)
                 {
-                    if(m_FieldMap[name].GetValue(es) is bool)
+                    if (m_FieldMap[name].GetValue(es) is bool)
                     {
                         int v = Convert.ToInt32(r[name]);
-                        if(v != 0)
+                        if (v != 0)
                             m_FieldMap[name].SetValue(es, true);
                         else
                             m_FieldMap[name].SetValue(es, false);
@@ -133,9 +133,9 @@ namespace OpenSim.Data.SQLite
 
                 foreach (string name in FieldList)
                 {
-                    if(m_FieldMap[name].GetValue(es) is bool)
+                    if (m_FieldMap[name].GetValue(es) is bool)
                     {
-                        if((bool)m_FieldMap[name].GetValue(es))
+                        if ((bool)m_FieldMap[name].GetValue(es))
                             cmd.Parameters.Add(":"+name, "1");
                         else
                             cmd.Parameters.Add(":"+name, "0");
@@ -215,9 +215,9 @@ namespace OpenSim.Data.SQLite
 
             foreach (string name in FieldList)
             {
-                if(m_FieldMap[name].GetValue(es) is bool)
+                if (m_FieldMap[name].GetValue(es) is bool)
                 {
-                    if((bool)m_FieldMap[name].GetValue(es))
+                    if ((bool)m_FieldMap[name].GetValue(es))
                         cmd.Parameters.Add(":"+name, "1");
                     else
                         cmd.Parameters.Add(":"+name, "0");
@@ -247,7 +247,7 @@ namespace OpenSim.Data.SQLite
 
             IDataReader r = cmd.ExecuteReader();
 
-            while(r.Read())
+            while (r.Read())
             {
                 EstateBan eb = new EstateBan();
 
@@ -275,7 +275,7 @@ namespace OpenSim.Data.SQLite
 
             cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
             
-            foreach(EstateBan b in es.EstateBans)
+            foreach (EstateBan b in es.EstateBans)
             {
                 cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
                 cmd.Parameters.Add(":bannedUUID", b.bannedUUID.ToString());
@@ -298,7 +298,7 @@ namespace OpenSim.Data.SQLite
 
             cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
             
-            foreach(LLUUID uuid in data)
+            foreach (LLUUID uuid in data)
             {
                 cmd.Parameters.Add(":EstateID", EstateID.ToString());
                 cmd.Parameters.Add(":uuid", uuid.ToString());
@@ -319,7 +319,7 @@ namespace OpenSim.Data.SQLite
 
             IDataReader r = cmd.ExecuteReader();
 
-            while(r.Read())
+            while (r.Read())
             {
                 // EstateBan eb = new EstateBan();